[#801] Moved mocha to before nosetests

ckan · Jul 18, 2013 · d7b5b3c · d7b5b3c
1 parent 1a5b63c
commit d7b5b3c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/bin/travis-build b/bin/travis-build
@@ -50,9 +50,10 @@ fi
 
 cat test-core.ini
 
-# And finally, run the tests
-nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext
-
-# Run mocha tests
+# Run mocha front-end tests
 paster serve --reload test-core.ini &
 mocha-phantomjs http://localhost:5000/base/test/index.html
+kill %1
+
+# And finally, run the tests
+nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext