diff options
Diffstat (limited to 'keystoneclient/tests/unit/v2_0/test_auth.py')
| -rw-r--r-- | keystoneclient/tests/unit/v2_0/test_auth.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/keystoneclient/tests/unit/v2_0/test_auth.py b/keystoneclient/tests/unit/v2_0/test_auth.py index 2c69dc3..5f318ff 100644 --- a/keystoneclient/tests/unit/v2_0/test_auth.py +++ b/keystoneclient/tests/unit/v2_0/test_auth.py @@ -67,7 +67,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(response_list=[{'json': resp_a, 'headers': headers}, {'json': resp_b, 'headers': headers}]) - cs = client.Client(tenant_id=self.TEST_TENANT_ID, + cs = client.Client(project_id=self.TEST_TENANT_ID, auth_url=self.TEST_URL, username=self.TEST_USER, password=self.TEST_TOKEN) @@ -95,7 +95,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): def client_create_wrapper(): client.Client(username=self.TEST_USER, password="bad_key", - tenant_id=self.TEST_TENANT_ID, + project_id=self.TEST_TENANT_ID, auth_url=self.TEST_URL) self.assertRaises(exceptions.Unauthorized, client_create_wrapper) @@ -110,7 +110,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): cs = client.Client(username=self.TEST_USER, password=self.TEST_TOKEN, - tenant_id=self.TEST_TENANT_ID, + project_id=self.TEST_TENANT_ID, auth_url=self.TEST_URL) self.assertEqual(cs.management_url, @@ -125,7 +125,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): cs = client.Client(username=self.TEST_USER, password=self.TEST_TOKEN, - tenant_id=self.TEST_TENANT_ID, + project_id=self.TEST_TENANT_ID, auth_url=self.TEST_URL) self.assertEqual(cs.management_url, self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3] @@ -162,7 +162,8 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): json_body = jsonutils.loads(self.requests_mock.last_request.body) self.assertEqual(json_body['auth']['token']['id'], fake_token) - resp, body = cl.get(fake_url) + with self.deprecations.expect_deprecations_here(): + resp, body = cl.get(fake_url) self.assertEqual(fake_resp, body) token = self.requests_mock.last_request.headers.get('X-Auth-Token') @@ -174,7 +175,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(json=self.TEST_RESPONSE_DICT) cs = client.Client(token=self.TEST_TOKEN, - tenant_id=self.TEST_TENANT_ID, + project_id=self.TEST_TENANT_ID, auth_url=self.TEST_URL) self.assertEqual(cs.management_url, self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3] @@ -193,7 +194,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(json=response) cs = client.Client(token=self.TEST_TOKEN, - tenant_id=self.TEST_TENANT_ID, + project_id=self.TEST_TENANT_ID, trust_id=self.TEST_TRUST_ID, auth_url=self.TEST_URL) self.assertTrue(cs.auth_ref.trust_scoped) @@ -227,13 +228,14 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): cl = client.Client(username='exampleuser', password='password', - tenant_name='exampleproject', + project_name='exampleproject', auth_url=self.TEST_URL) self.assertEqual(cl.auth_token, self.TEST_TOKEN) # the token returned from the authentication will be used - resp, body = cl.get(fake_url) + with self.deprecations.expect_deprecations_here(): + resp, body = cl.get(fake_url) self.assertEqual(fake_resp, body) token = self.requests_mock.last_request.headers.get('X-Auth-Token') @@ -242,7 +244,8 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): # then override that token and the new token shall be used cl.auth_token = fake_token - resp, body = cl.get(fake_url) + with self.deprecations.expect_deprecations_here(): + resp, body = cl.get(fake_url) self.assertEqual(fake_resp, body) token = self.requests_mock.last_request.headers.get('X-Auth-Token') @@ -251,7 +254,8 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): # if we clear that overridden token then we fall back to the original del cl.auth_token - resp, body = cl.get(fake_url) + with self.deprecations.expect_deprecations_here(): + resp, body = cl.get(fake_url) self.assertEqual(fake_resp, body) token = self.requests_mock.last_request.headers.get('X-Auth-Token') |