From 77c5339312327b287173068373d245abb53ebb99 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 31 Jan 2023 16:47:46 +0100 Subject: [PATCH] Fix PytestReturnNotNoneWarning in test_conserved_quantities_demartino.py (#1968) Fixes ``` C:\hostedtoolcache\windows\Python\3.8.10\x64\lib\site-packages\_pytest\python.py:199: PytestReturnNotNoneWarning: Expected None, but python/tests/test_conserved_quantities_demartino.py::test_compute_moiety_conservation_laws_demartino2014 returned 7.324800299999993, which will be an error in a future version of pytest. Did you mean to use `assert` instead of `return`? ``` --- .../test_conserved_quantities_demartino.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/python/tests/test_conserved_quantities_demartino.py b/python/tests/test_conserved_quantities_demartino.py index 476d456411..d6808c6202 100644 --- a/python/tests/test_conserved_quantities_demartino.py +++ b/python/tests/test_conserved_quantities_demartino.py @@ -190,13 +190,13 @@ def test_fill_demartino2014(data_demartino2014): assert not any(fields[len(ref_for_fields):]) -@skip_on_valgrind -def test_compute_moiety_conservation_laws_demartino2014( +def compute_moiety_conservation_laws_demartino2014( data_demartino2014, quiet=False ): - """Invoke test case and benchmarking for De Martino's published results + """Compute conserved quantities for De Martino's published results for E. coli network""" stoichiometric_list, row_names = data_demartino2014 + num_species = 1668 num_reactions = 2381 assert len(stoichiometric_list) == num_species * num_reactions, \ @@ -216,6 +216,15 @@ def test_compute_moiety_conservation_laws_demartino2014( return runtime +@skip_on_valgrind +def test_compute_moiety_conservation_laws_demartino2014(data_demartino2014): + """Invoke test case and benchmarking for De Martino's published results + for E. coli network""" + compute_moiety_conservation_laws_demartino2014( + data_demartino2014, quiet=False + ) + + @skip_on_valgrind @log_execution_time("Detecting moiety conservation laws", logger) def test_cl_detect_execution_time(data_demartino2014): @@ -229,7 +238,7 @@ def test_cl_detect_execution_time(data_demartino2014): runtime = np.Inf for _ in range(max_tries): - runtime = test_compute_moiety_conservation_laws_demartino2014( + runtime = compute_moiety_conservation_laws_demartino2014( data_demartino2014, quiet=True) if runtime < max_time_seconds: break