Skip to content

Commit 1aa23e0

Browse files
committed
Merge pull request #803 from deis/postgres-tests-workaround
fix(tests): skip problematic section of BuildTest
2 parents 3e753ac + 3b2ee0d commit 1aa23e0

4 files changed

Lines changed: 8 additions & 3 deletions

File tree

controller/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ db:
4141
python manage.py syncdb --migrate --noinput
4242

4343
coverage:
44-
coverage run --timid manage.py test --noinput api web
44+
coverage run manage.py test --noinput api web
4545
coverage html
4646

4747
flake8:

controller/api/tests/test_build.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from __future__ import unicode_literals
88

99
import json
10+
import unittest
1011

1112
from django.test import TransactionTestCase
1213
from django.test.utils import override_settings
@@ -44,6 +45,10 @@ def test_build(self):
4445
response = self.client.get(url)
4546
self.assertEqual(response.status_code, 200)
4647
self.assertEqual(response.data['count'], 1)
48+
# TODO: the next test section seems to break `make test`.
49+
# See https://github.com/deis/deis/issues/727
50+
raise unittest.SkipTest(
51+
"Breaks database cleanup, see https://github.com/deis/deis/issues/727")
4752
# post a new build
4853
body = {'image': 'autotest/example'}
4954
response = self.client.post(url, json.dumps(body), content_type='application/json')

docs/contributing/localdev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ that test coverage has improved as a result of your changes and new unit tests.
213213
make: *** [flake8] Error 1
214214
$
215215
$ make coverage
216-
coverage run --timid manage.py test --noinput api web
216+
coverage run manage.py test --noinput api web
217217
WARNING Cannot synchronize with etcd cluster
218218
Creating test database for alias 'default'...
219219
...............................................

docs/contributing/standards.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ensure that everything passes and that code coverage has not declined.
6565
.. code-block:: console
6666
6767
$ make -C controller coverage
68-
coverage run --timid manage.py test --noinput api web
68+
coverage run manage.py test --noinput api web
6969
WARNING Cannot synchronize with etcd cluster
7070
Creating test database for alias 'default'...
7171
...............................................

0 commit comments

Comments
 (0)