From 9cf91c951ed74e245693ca1f1b3df8965484dc94 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Sun, 25 Mar 2012 11:32:08 -0500 Subject: endpoint-crud 404 (bug 963056) endpoint-create endpoint-delete Change-Id: I70ae14ca385a0ed2d3438b8dc2f7ba93b91f400b --- keystone/exception.py | 2 +- tests/test_keystoneclient.py | 25 +++++++++++++++++++++++++ tests/test_keystoneclient_sql.py | 7 +++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/keystone/exception.py b/keystone/exception.py index c76201b0..f1651bf0 100644 --- a/keystone/exception.py +++ b/keystone/exception.py @@ -74,7 +74,7 @@ class NotFound(Error): class EndpointNotFound(NotFound): - """Could not find endopint: %(endpoint_id)s""" + """Could not find endpoint: %(endpoint_id)s""" class RoleNotFound(NotFound): diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py index aa2a5f6d..064a8e34 100644 --- a/tests/test_keystoneclient.py +++ b/tests/test_keystoneclient.py @@ -599,6 +599,25 @@ class KeystoneClientTests(object): client.services.get, id=uuid.uuid4().hex) + def test_endpoint_create_404(self): + from keystoneclient import exceptions as client_exceptions + client = self.get_client(admin=True) + self.assertRaises(client_exceptions.NotFound, + client.endpoints.create, + region=uuid.uuid4().hex, + service_id=uuid.uuid4().hex, + publicurl=uuid.uuid4().hex, + adminurl=uuid.uuid4().hex, + internalurl=uuid.uuid4().hex) + + def test_endpoint_delete_404(self): + # the catalog backend is expected to return Not Implemented + from keystoneclient import exceptions as client_exceptions + client = self.get_client(admin=True) + self.assertRaises(client_exceptions.HTTPNotImplemented, + client.endpoints.delete, + id=uuid.uuid4().hex) + def test_admin_requires_adminness(self): from keystoneclient import exceptions as client_exceptions # FIXME(ja): this should be Unauthorized @@ -860,3 +879,9 @@ class KcEssex3TestCase(CompatTestCase, KeystoneClientTests): def test_user_update_404(self): raise nose.exc.SkipTest('N/A') + + def test_endpoint_create_404(self): + raise nose.exc.SkipTest('N/A') + + def test_endpoint_delete_404(self): + raise nose.exc.SkipTest('N/A') diff --git a/tests/test_keystoneclient_sql.py b/tests/test_keystoneclient_sql.py index 641ee770..9a13712a 100644 --- a/tests/test_keystoneclient_sql.py +++ b/tests/test_keystoneclient_sql.py @@ -72,3 +72,10 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase): client.endpoints.delete(id=endpoint.id) self.assertRaises(client_exceptions.NotFound, client.endpoints.delete, id=endpoint.id) + + def test_endpoint_delete_404(self): + from keystoneclient import exceptions as client_exceptions + client = self.get_client(admin=True) + self.assertRaises(client_exceptions.NotFound, + client.endpoints.delete, + id=uuid.uuid4().hex) -- cgit