Merge pull request #1665 from ReactionMechanismGenerator/debug_travis

Debug travis
ReactionMechanismGenerator · Jul 24, 2019 · 6274d70 · 6274d70
2 parents 9b3d0cc + 0541d3d
commit 6274d70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,9 @@ stages:
 
 before_install:
   - cd ..
+  # Display CPU and memory information on the Linux builds
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then lscpu; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then free -m; fi
   # Install miniconda
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget http://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh; fi

diff --git a/rmgpy/rmg/reactTest.py b/rmgpy/rmg/reactTest.py
@@ -99,6 +99,9 @@ def testReactParallel(self):
         self.assertEqual(len(reaction_list), 3)
         self.assertTrue(all([isinstance(rxn, TemplateReaction) for rxn in reaction_list]))
 
+        # Reset module level maxproc back to default
+        rmgpy.rmg.main.maxproc = 1
+
     def testReactAll(self):
         """
         Test that the ``react_all`` function works in serial
@@ -147,6 +150,9 @@ def testReactAllParallel(self):
         self.assertEqual(len(flat_rxn_list), 44)
         self.assertTrue(all([isinstance(rxn, TemplateReaction) for rxn in flat_rxn_list]))
 
+        # Reset module level maxproc back to default
+        rmgpy.rmg.main.maxproc = 1
+
     def tearDown(self):
         """
         Reset the loaded database