Commit cf852715 authored by Jason Swails's avatar Jason Swails

Fix tests when Gromacs is not installed and for pypy

parent efb23cb8
...@@ -17,13 +17,13 @@ fi ...@@ -17,13 +17,13 @@ fi
sh devtools/travis-ci/pyflakes_check.sh sh devtools/travis-ci/pyflakes_check.sh
cd test cd test
echo "Using nosetests...:" echo "Using nosetests...:"
./run_scripts.sh
if [ "$PYTHON_VERSION" = "pypy" ]; then if [ "$PYTHON_VERSION" = "pypy" ]; then
# Disable coverage with pypy, since it multiplies the time taken by 6 or # Disable coverage with pypy, since it multiplies the time taken by 6 or
# something ridiculous like that # something ridiculous like that
nosetests -vs --with-timer --timer-ok=5s --timer-warning=12s \ nosetests -vs --with-timer --timer-ok=5s --timer-warning=12s \
--timer-filter=warning,error . --timer-filter=warning,error .
else else
./run_scripts.sh
# Run nose under coverage, since that allows getting the full flexibility of # Run nose under coverage, since that allows getting the full flexibility of
# the coverage package without sacrificing nose functionality # the coverage package without sacrificing nose functionality
test -z "$MINIMAL_PACKAGES" && export AMBERHOME=$HOME/miniconda/envs/myenv test -z "$MINIMAL_PACKAGES" && export AMBERHOME=$HOME/miniconda/envs/myenv
......
...@@ -3528,6 +3528,7 @@ class TestOtherParm(FileIOTestCase): ...@@ -3528,6 +3528,7 @@ class TestOtherParm(FileIOTestCase):
repr(PT.printDihedrals(parm, ':*', ':*', ':1')) repr(PT.printDihedrals(parm, ':*', ':*', ':1'))
repr(PT.printDihedrals(parm, ':*', ':*', ':*', ':*')) repr(PT.printDihedrals(parm, ':*', ':*', ':*', ':*'))
@unittest.skipUnless(HAS_GROMACS, 'Cannot test without GROMACS')
def test_parm(self): def test_parm(self):
""" Tests the parm action on a series of topology types and listParms """ """ Tests the parm action on a series of topology types and listParms """
parms = parmlist.ParmList() parms = parmlist.ParmList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment