Update circle-ci to run quality after jshint has been added to PATH.

[Also correct some comments.]

pavelib/paver_tests/test_paver_quality.py

@@ -239,7 +239,7 @@ class TestPaverRunQuality(unittest.TestCase):
         # Test that both pep8 and pylint were called by counting the calls
         # Assert that _get_pep8_violations (which calls "pep8") is called once
         self.assertEqual(_mock_pep8_violations.call_count, 1)
-        # And assert that sh was called once (for the calls to pep8 and pylint)
+        # And assert that sh was called twice (for the calls to pep8 and pylint)
         self.assertEqual(self._mock_paver_sh.call_count, 2)
 
     @patch('__builtin__.open', mock_open())
@@ -263,7 +263,7 @@ class TestPaverRunQuality(unittest.TestCase):
             pavelib.quality.run_quality("")
         # Assert that _get_pep8_violations (which calls "pep8") is called once
         self.assertEqual(_mock_pep8_violations.call_count, 1)
-        # And assert that sh was called once (for the call to "pylint" & "jshint")
+        # And assert that sh was called twice (for the call to "pylint" & "jshint")
         self.assertEqual(self._mock_paver_sh.call_count, 2)
 
 

scripts/circle-ci-tests.sh

@@ -44,13 +44,14 @@ case $CIRCLE_NODE_INDEX in
         # fails and aborts the job because nothing is displayed for > 10 minutes.
         paver run_pylint -l $PYLINT_THRESHOLD | tee pylint.log || EXIT=1
 
-        # Run quality task. Pass in the 'fail-under' percentage to diff-quality
-        paver run_quality -p 100 || EXIT=1
-
         mkdir -p reports
         echo "Finding jshint violations and storing report..."
         PATH=$PATH:node_modules/.bin
         paver run_jshint -l $JSHINT_THRESHOLD > jshint.log || { cat jshint.log; EXIT=1; }
+
+        # Run quality task. Pass in the 'fail-under' percentage to diff-quality
+        paver run_quality -p 100 || EXIT=1
+
         echo "Running code complexity report (python)."
         paver run_complexity > reports/code_complexity.log || echo "Unable to calculate code complexity. Ignoring error."