Merge pull request #756 from hgscott/cycles_met_ids

Cycles met ids

src/memote/suite/tests/test_consistency.py

@@ -24,6 +24,7 @@
 
 import memote.support.consistency as consistency
 import memote.support.consistency_helpers as con_helpers
+import memote.support.helpers as helpers
 from memote.utils import annotate, get_ids, truncate, wrapper
 
 
@@ -153,11 +154,18 @@ def test_detect_energy_generating_cycles(model, met):
 
     """
     ann = test_detect_energy_generating_cycles.annotation
-    if met not in model.metabolites:
+    # Test if the metabolite is present in the model.
+    main_comp = helpers.find_compartment_id_in_model(model, "c")
+    try:
+        helpers.find_met_in_model(model, met, main_comp)[0]
+    except ValueError:
+        pytest.skip("Metabolite {} is not in the MetaNetX shortlist.".format(met))
+    except (RuntimeError, IndexError):
         pytest.skip(
             "This test has been skipped since metabolite {} could "
             "not be found in the model.".format(met)
         )
+    # If the metabolite is present, carry out the test.
     ann["data"][met] = consistency.detect_energy_generating_cycles(model, met)
     # Report the number of cycles scaled by the number of reactions.
     ann["metric"][met] = len(ann["data"][met]) / len(model.reactions)