Merge pull request #742 from opdemand/postgresql-test-errors

fix(controller/tests): run coverage with "--timid" flag

Author: Matthew Fisher

.travis.yml

@@ -10,7 +10,6 @@ branches:
   only:
     - master
     - release
-    - scheduler
 
 services:
   - postgresql

controller/Makefile

@@ -41,7 +41,7 @@ db:
 	python manage.py syncdb --migrate --noinput
 
 coverage:
-	coverage run manage.py test --noinput api web
+	coverage run --timid manage.py test --noinput api web
 	coverage html
 
 flake8:

docs/contributing/localdev.rst

@@ -213,13 +213,14 @@ that test coverage has improved as a result of your changes and new unit tests.
 	make: *** [flake8] Error 1
 	$
 	$ make coverage
-	coverage run manage.py test api celerytasks client web
+	coverage run --timid manage.py test --noinput api web
+	WARNING Cannot synchronize with etcd cluster
 	Creating test database for alias 'default'...
-	...................ss
+	...............................................
 	----------------------------------------------------------------------
-	Ran 21 tests in 18.135s
+	Ran 47 tests in 47.768s
 
-	OK (skipped=2)
+	OK
 	Destroying test database for alias 'default'...
 	coverage html
 	$ head -n 25 htmlcov/index.html | grep pc_cov

docs/contributing/standards.rst

@@ -65,12 +65,12 @@ ensure that everything passes and that code coverage has not declined.
 .. code-block:: console
 
     $ make -C controller coverage
-    coverage run manage.py test --noinput api cm provider web
+    coverage run --timid manage.py test --noinput api web
     WARNING Cannot synchronize with etcd cluster
     Creating test database for alias 'default'...
-    ....................................................................
+    ...............................................
     ----------------------------------------------------------------------
-    Ran 68 tests in 84.856s
+    Ran 47 tests in 47.768s
 
     OK
     Destroying test database for alias 'default'...