Merge a27c025 into 56f52ad

openpathsampling/tests/test_features.py

@@ -1,12 +1,10 @@
 from __future__ import absolute_import
 from builtins import hex
 from builtins import object
-from nose.tools import (assert_equal, assert_not_equal,
-                        assert_almost_equal, raises, assert_in)
+from nose.tools import raises
 
-from nose.plugins.skip import Skip, SkipTest
-from .test_helpers import (true_func, assert_equal_array_array,
-                           make_1d_traj, assert_items_equal, u)
+from nose.plugins.skip import SkipTest
+from .test_helpers import u
 
 import logging
 
@@ -43,7 +41,7 @@ def test_copy_with_replacement_toy(self):
         assert(toy_copy.velocities[1] == 1.0)
 
     def test_copy_with_replacement_openmm(self):
-        if not paths.integration_tools.HAS_OPENMM:
+        if not paths.integration_tools.HAS_OPENMM or omt is None:
             raise SkipTest
         # test an openmm snapshot
         sys = omt.testsystems.AlanineDipeptideVacuum()
@@ -71,4 +69,4 @@ def test_parameter_error(self):
         init_vel = np.array([3.0, 4.0])
         toy_snap = toy_engine.Snapshot(
             coordinates=init_coord, velocities=init_vel)
-        toy_copy = toy_snap.copy_with_replacement(dummy=0)
+        toy_snap.copy_with_replacement(dummy=0)