Move tests > 50 seconds to jenkins

joe-nano · May 12, 2017 · 23d9245 · 23d9245
1 parent c0b143b
commit 23d9245
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ install:
 - pip install coveralls
 - python setup.py install
 script:
-- nosetests --with-timer --with-coverage --cover-package=deepchem -v deepchem --nologcapture
+- nosetests -a '!slow' --with-timer --with-coverage --cover-package=deepchem -v deepchem --nologcapture
 - find ./deepchem | grep .py$ |xargs python -m doctest -v
 - bash devtools/travis-ci/test_format_code.sh
 after_success:

diff --git a/deepchem/dock/tests/test_docking.py b/deepchem/dock/tests/test_docking.py
@@ -1,19 +1,17 @@
 """
 Tests for Docking 
 """
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 __author__ = "Bharath Ramsundar"
 __copyright__ = "Copyright 2016, Stanford University"
 __license__ = "MIT"
 
 import unittest
-import tempfile
 import os
-import shutil
-import numpy as np
+from nose.tools import attr
 import sys
 import deepchem as dc
 
@@ -117,6 +115,7 @@ def test_vina_grid_dnn_docker_dock(self):
     assert os.path.exists(protein_docked)
     assert os.path.exists(ligand_docked)
 
+  @attr('slow')
   def test_pocket_vina_grid_dnn_docker_dock(self):
     """Test that VinaGridDNNDocker can dock."""
     if sys.version_info >= (3, 0):

diff --git a/deepchem/dock/tests/test_pose_generation.py b/deepchem/dock/tests/test_pose_generation.py
@@ -1,8 +1,8 @@
 """
 Tests for Pose Generation 
 """
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 __author__ = "Bharath Ramsundar"
@@ -12,9 +12,6 @@
 import os
 import sys
 import unittest
-import tempfile
-import shutil
-import numpy as np
 import deepchem as dc
 
 
@@ -50,6 +47,7 @@ def test_vina_poses(self):
     assert os.path.exists(protein_pose_file)
     assert os.path.exists(ligand_pose_file)
 
+  @attr('slow')
   def test_pocket_vina_poses(self):
     """Test that VinaPoseGenerator creates pose files."""
     if sys.version_info >= (3, 0):

diff --git a/deepchem/models/autoencoder_models/test_tensorflowEncoders.py b/deepchem/models/autoencoder_models/test_tensorflowEncoders.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from nose.tools import assert_equals
+from nose.tools import assert_equals, attr
 from rdkit import Chem
 
 import deepchem as dc
@@ -11,6 +11,7 @@
 
 class TestTensorflowEncoders(TestCase):
 
+  @attr('slow')
   def test_fit(self):
     tf_enc = TensorflowMoleculeEncoder.zinc_encoder()
 

diff --git a/deepchem/molnet/tests/test_molnet.py b/deepchem/molnet/tests/test_molnet.py
@@ -1,17 +1,19 @@
 """
 Tests for molnet function 
 """
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
-import os
+import csv
+import tempfile
 import unittest
+
 import numpy as np
-import pandas as pd
+import os
+from nose.tools import attr
+
 import deepchem as dc
-import tempfile
-import csv
 
 
 class TestMolnet(unittest.TestCase):
@@ -23,6 +25,7 @@ def setUp(self):
     super(TestMolnet, self).setUp()
     self.current_dir = os.path.dirname(os.path.abspath(__file__))
 
+  @attr('slow')
   def test_delaney_graphconvreg(self):
     """Tests molnet benchmarking on delaney with graphconvreg."""
     datasets = ['delaney']
@@ -45,6 +48,7 @@ def test_delaney_graphconvreg(self):
       assert float(lastrow[-3]) > 0.75
     os.remove(os.path.join(out_path, 'results.csv'))
 
+  @attr('slow')
   def test_qm7_multitask(self):
     """Tests molnet benchmarking on qm7 with multitask network."""
     datasets = ['qm7']

diff --git a/deepchem/utils/test/test_generator_evaluator.py b/deepchem/utils/test/test_generator_evaluator.py
@@ -12,7 +12,6 @@
 
 class TestGeneratorEvaluator(TestCase):
 
-  @attr('slow')
   def test_compute_model_performance_multitask_classifier(self):
     n_data_points = 20
     n_features = 2
@@ -65,7 +64,6 @@ def test_compute_model_performance_multitask_classifier(self):
     # Loosening atol to see if tests stop failing sporadically
     assert_true(np.all(np.isclose(scores, [1.0, 1.0], atol=0.50)))
 
-  @attr('slow')
   def test_compute_model_performance_singletask_classifier(self):
     n_data_points = 20
     n_features = 10
@@ -116,7 +114,6 @@ def test_compute_model_performance_singletask_classifier(self):
     scores = list(scores[1].values())
     assert_true(np.isclose(scores, [1.0], atol=0.05))
 
-  @attr('slow')
   def test_compute_model_performance_multitask_regressor(self):
     random_seed = 42
     n_data_points = 20
@@ -170,7 +167,6 @@ def test_compute_model_performance_multitask_regressor(self):
     scores = list(scores[1].values())
     assert_true(np.all(np.isclose(scores, [0.0, 0.0], atol=1.0)))
 
-  @attr('slow')
   def test_compute_model_performance_singletask_regressor(self):
     n_data_points = 20
     n_features = 2

diff --git a/devtools/jenkins/jenkins.sh b/devtools/jenkins/jenkins.sh
@@ -12,8 +12,10 @@ export retval1=$?
 cd ..
 nosetests -v devtools/jenkins/compare_results.py --with-xunit || true
 export retval2=$?
+nosetests -a 'slow' --with-timer deepchem --with-xunit -unit-file=slow_tests.xml|| true
+export retval3=$?
 
 source deactivate
 conda remove --name $envname --all
-export retval=$(($retval1 + $retval2))
+export retval=$(($retval1 + $retval2 + $retval3))
 exit ${retval}