diff options
| author | Adam Young <ayoung@redhat.com> | 2013-06-24 12:27:50 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2013-06-28 14:33:49 -0400 |
| commit | 431cecb81d4ae76255dfac9dc6eb8b9fbda97037 (patch) | |
| tree | 2dba1086bdfaf85d27055a353a84dd55a17949fc /tests/test_backend_templated.py | |
| parent | 911c3156563c4e33bff3b4652b30c744f8b12de6 (diff) | |
| download | keystone-431cecb81d4ae76255dfac9dc6eb8b9fbda97037.tar.gz keystone-431cecb81d4ae76255dfac9dc6eb8b9fbda97037.tar.xz keystone-431cecb81d4ae76255dfac9dc6eb8b9fbda97037.zip | |
Manager instead of direct driver
Make calls via the manager as opposed to the drivers
in order to support refactoring of common code
Bug 1193420
Change-Id: I69117ea755ed7ef3f7d3732fee83cc758927d296
Diffstat (limited to 'tests/test_backend_templated.py')
| -rw-r--r-- | tests/test_backend_templated.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test_backend_templated.py b/tests/test_backend_templated.py index 72dd21a7..bfa19192 100644 --- a/tests/test_backend_templated.py +++ b/tests/test_backend_templated.py @@ -18,8 +18,6 @@ import os from keystone import test -from keystone import catalog -from keystone.catalog.backends import templated as catalog_templated from keystone import exception import default_fixtures @@ -54,8 +52,7 @@ class TestTemplatedCatalog(test.TestCase, test_backend.CatalogTests): def setUp(self): super(TestTemplatedCatalog, self).setUp() self.opt_in_group('catalog', template_file=DEFAULT_CATALOG_TEMPLATES) - self.catalog_api = catalog_templated.TemplatedCatalog() - self.catalog_man = catalog.Manager() + self.load_backends() self.load_fixtures(default_fixtures) def test_get_catalog(self): @@ -63,7 +60,8 @@ class TestTemplatedCatalog(test.TestCase, test_backend.CatalogTests): self.assertDictEqual(catalog_ref, self.DEFAULT_FIXTURE) def test_malformed_catalog_throws_error(self): - self.catalog_api.templates['RegionOne']['compute']['adminURL'] = \ + (self.catalog_api.driver.templates + ['RegionOne']['compute']['adminURL']) = \ 'http://localhost:$(compute_port)s/v1.1/$(tenant)s' with self.assertRaises(exception.MalformedEndpoint): self.catalog_api.get_catalog('fake-user', 'fake-tenant') |