diff options
Diffstat (limited to 'keystone-moon/keystone/tests/unit/test_no_admin_token_auth.py')
| -rw-r--r-- | keystone-moon/keystone/tests/unit/test_no_admin_token_auth.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/keystone-moon/keystone/tests/unit/test_no_admin_token_auth.py b/keystone-moon/keystone/tests/unit/test_no_admin_token_auth.py index 9f67fbd7..bf60cff0 100644 --- a/keystone-moon/keystone/tests/unit/test_no_admin_token_auth.py +++ b/keystone-moon/keystone/tests/unit/test_no_admin_token_auth.py @@ -14,12 +14,13 @@ import os +from six.moves import http_client import webtest -from keystone.tests import unit as tests +from keystone.tests import unit -class TestNoAdminTokenAuth(tests.TestCase): +class TestNoAdminTokenAuth(unit.TestCase): def setUp(self): super(TestNoAdminTokenAuth, self).setUp() self.load_backends() @@ -27,7 +28,7 @@ class TestNoAdminTokenAuth(tests.TestCase): self._generate_paste_config() self.admin_app = webtest.TestApp( - self.loadapp(tests.dirs.tmp('no_admin_token_auth'), name='admin'), + self.loadapp(unit.dirs.tmp('no_admin_token_auth'), name='admin'), extra_environ=dict(REMOTE_ADDR='127.0.0.1')) self.addCleanup(setattr, self, 'admin_app', None) @@ -35,12 +36,12 @@ class TestNoAdminTokenAuth(tests.TestCase): # Generate a file, based on keystone-paste.ini, that doesn't include # admin_token_auth in the pipeline - with open(tests.dirs.etc('keystone-paste.ini'), 'r') as f: + with open(unit.dirs.etc('keystone-paste.ini'), 'r') as f: contents = f.read() new_contents = contents.replace(' admin_token_auth ', ' ') - filename = tests.dirs.tmp('no_admin_token_auth-paste.ini') + filename = unit.dirs.tmp('no_admin_token_auth-paste.ini') with open(filename, 'w') as f: f.write(new_contents) self.addCleanup(os.remove, filename) @@ -56,4 +57,4 @@ class TestNoAdminTokenAuth(tests.TestCase): # If the following does not raise, then the test is successful. self.admin_app.get(REQ_PATH, headers={'X-Auth-Token': 'NotAdminToken'}, - status=401) + status=http_client.UNAUTHORIZED) |