Merge "Allow running individual tests via tox"

This commit is contained in:
Jenkins 2015-02-17 18:21:25 +00:00 committed by Gerrit Code Review
commit 3b5029aeab
2 changed files with 4 additions and 4 deletions

View File

@ -504,7 +504,7 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, test.TestCase):
def setUp(self):
super(OpenStackAuthTestsV3, self).setUp()
if self.interface:
if getattr(self, 'interface', None):
override = self.settings(OPENSTACK_ENDPOINT_TYPE=self.interface)
override.enable()
self.addCleanup(override.disable)

View File

@ -14,15 +14,15 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_SHOW_ELAPSED=1
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python openstack_auth/tests/run_tests.py
commands = python openstack_auth/tests/run_tests.py {posargs}
[testenv:py27dj15]
commands = pip install django>=1.5,<1.6
python openstack_auth/tests/run_tests.py
python openstack_auth/tests/run_tests.py {posargs}
[testenv:py27dj14]
commands = pip install django>=1.4,<1.5
python openstack_auth/tests/run_tests.py
python openstack_auth/tests/run_tests.py {posargs}
[testenv:pep8]
setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings