diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2016-01-13 15:18:19 -0600 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2016-01-13 15:20:01 -0600 |
| commit | 5e1cfbb7deeb7b5c819c45fadcf4abdf2ddcb118 (patch) | |
| tree | 65b58951b7a5e13c1689272c62eef4fc94e2f744 /keystoneclient/tests | |
| parent | 7327067f98f5e118790817f7c81e444c7fe7c25b (diff) | |
| download | python-keystoneclient-5e1cfbb7deeb7b5c819c45fadcf4abdf2ddcb118.tar.gz | |
Revert "Change default endpoint for Keystone v3 to public"
This reverts commit d3b11d674d6539a0a09e0c432983ebf172e8ad79.
This is causing auth_token middleware tests to fail. The error is
like:
EndpointNotFound: public endpoint for identity service in east
region not found
So this is going to potentially affect customers.
Change-Id: I5ad917e48c9b140709dd3bf95e89c07ea58d6a66
Diffstat (limited to 'keystoneclient/tests')
| -rw-r--r-- | keystoneclient/tests/unit/v3/test_auth.py | 4 | ||||
| -rw-r--r-- | keystoneclient/tests/unit/v3/test_client.py | 10 | ||||
| -rw-r--r-- | keystoneclient/tests/unit/v3/utils.py | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/keystoneclient/tests/unit/v3/test_auth.py b/keystoneclient/tests/unit/v3/test_auth.py index 5928f8e..177eb3b 100644 --- a/keystoneclient/tests/unit/v3/test_auth.py +++ b/keystoneclient/tests/unit/v3/test_auth.py @@ -232,7 +232,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(json=self.TEST_RESPONSE_DICT) self.stub_url('GET', [fake_url], json=fake_resp, - base_url=self.TEST_PUBLIC_IDENTITY_ENDPOINT) + base_url=self.TEST_ADMIN_IDENTITY_ENDPOINT) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): @@ -336,7 +336,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(json=self.TEST_RESPONSE_DICT) self.stub_url('GET', [fake_url], json=fake_resp, - base_url=self.TEST_PUBLIC_IDENTITY_ENDPOINT) + base_url=self.TEST_ADMIN_IDENTITY_ENDPOINT) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): diff --git a/keystoneclient/tests/unit/v3/test_client.py b/keystoneclient/tests/unit/v3/test_client.py index 902881f..e35810e 100644 --- a/keystoneclient/tests/unit/v3/test_client.py +++ b/keystoneclient/tests/unit/v3/test_client.py @@ -257,13 +257,3 @@ class KeystoneClientTest(utils.TestCase): self.assertEqual('identity', cl._adapter.service_type) self.assertEqual((3, 0), cl._adapter.version) - - def test_client_params_default_interface(self): - opts = {'auth': token_endpoint.Token('a', 'b'), - 'service_name': uuid.uuid4().hex, - } - - sess = session.Session() - cl = client.Client(session=sess, **opts) - - self.assertEqual('public', cl._adapter.interface) diff --git a/keystoneclient/tests/unit/v3/utils.py b/keystoneclient/tests/unit/v3/utils.py index d573608..0e88a55 100644 --- a/keystoneclient/tests/unit/v3/utils.py +++ b/keystoneclient/tests/unit/v3/utils.py @@ -48,7 +48,6 @@ class UnauthenticatedTestCase(utils.TestCase): class TestCase(UnauthenticatedTestCase): TEST_ADMIN_IDENTITY_ENDPOINT = "http://127.0.0.1:35357/v3" - TEST_PUBLIC_IDENTITY_ENDPOINT = "http://127.0.0.1:5000/v3" TEST_SERVICE_CATALOG = [{ "endpoints": [{ @@ -98,7 +97,7 @@ class TestCase(UnauthenticatedTestCase): "name": "glance" }, { "endpoints": [{ - "url": TEST_PUBLIC_IDENTITY_ENDPOINT, + "url": "http://127.0.0.1:5000/v3", "region": "RegionOne", "interface": "public" }, { |