Fix tests

openforcefield · Jul 14, 2023 · d41c6f4 · d41c6f4
1 parent 5108c15
commit d41c6f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/devtools/conda-envs/test_env.yaml b/devtools/conda-envs/test_env.yaml
@@ -1,4 +1,4 @@
-name: test
+name: openff-fragmenter-test
 
 channels:
   - conda-forge

diff --git a/openff/fragmenter/tests/test_chemi.py b/openff/fragmenter/tests/test_chemi.py
@@ -22,6 +22,7 @@
     ToolkitRegistry,
 )
 from openff.units import unit
+from openff.utilities import MissingOptionalDependencyError
 
 
 def test_assign_elf10_am1_bond_orders():
@@ -151,7 +152,7 @@ def test_find_stereocenters(smiles, expected_atoms, expected_bonds, find_method)
 
     try:
         stereogenic_atoms, stereogenic_bonds = find_method(molecule)
-    except ModuleNotFoundError as e:
+    except (ModuleNotFoundError, MissingOptionalDependencyError) as e:
         pytest.skip(str(e))
 
     assert stereogenic_atoms == expected_atoms
@@ -202,7 +203,7 @@ def test_extract_fragment(smiles, atoms, bonds, expected, extract_method):
 
     try:
         fragment = extract_method(molecule, atoms, bonds)
-    except ModuleNotFoundError as e:
+    except (ModuleNotFoundError, MissingOptionalDependencyError) as e:
         pytest.skip(str(e))
 
     expected_fragment = Molecule.from_smiles(expected)

diff --git a/openff/fragmenter/tests/test_depiction.py b/openff/fragmenter/tests/test_depiction.py
@@ -11,6 +11,7 @@
 )
 from openff.fragmenter.fragment import Fragment, FragmentationResult
 from openff.toolkit.topology import Molecule
+from openff.utilities import MissingOptionalDependencyError
 
 
 @pytest.mark.parametrize("draw_function", [_oe_render_parent, _rd_render_parent])
@@ -21,7 +22,7 @@ def test_xx_render_parent(draw_function):
                 "[C:1]([H:5])([H:6])([H:7])[C:2]([H:8])([H:9])[C:3]([H:10])([H:11])[C:4]([H:12])([H:13])([H:14])"
             )
         )
-    except ModuleNotFoundError as e:
+    except (ModuleNotFoundError, MissingOptionalDependencyError) as e:
         pytest.skip(str(e))
 
     assert isinstance(svg_contents, str)
@@ -41,7 +42,7 @@ def test_xx_render_fragment(draw_function):
             (1, 2),
         )
 
-    except ModuleNotFoundError as e:
+    except (ModuleNotFoundError, MissingOptionalDependencyError) as e:
         pytest.skip(str(e))
 
     assert isinstance(svg_contents, str)