diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-12-26 10:39:32 -0600 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2011-12-26 21:26:25 -0600 |
| commit | 067ab5b254d1375c44eaa640d8d4269c8fbfe3b4 (patch) | |
| tree | bbe8788fcafd6dd1dc1a43692c489f93c0fc0ab5 | |
| parent | 6c40cc9223f76f9242475b8f55165b38ff0999c7 (diff) | |
Fix: Client and Unit Tests not correctly failing a build
Change-Id: Id3ec3246932e74d00a0811aeaf44e33c2b56a8f2
| -rw-r--r-- | keystone/controllers/version.py | 2 | ||||
| -rw-r--r-- | keystone/test/__init__.py | 4 | ||||
| -rw-r--r-- | keystone/test/unit/test_backends.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/keystone/controllers/version.py b/keystone/controllers/version.py index efdd93b6..fb4e9892 100644 --- a/keystone/controllers/version.py +++ b/keystone/controllers/version.py @@ -26,7 +26,7 @@ class VersionController(wsgi.Controller): "keystone/content/%s.xml.tpl" % file) resp.content_type = "application/xml" elif utils.is_atom_response(req): - resp_file = os.path.join(possible_topdir, + resp_file = os.path.join(POSSIBLE_TOPDIR, "keystone/content/%s.atom.tpl" % file) resp.content_type = "application/atom+xml" else: diff --git a/keystone/test/__init__.py b/keystone/test/__init__.py index 0984c2e3..5e0d7c8a 100644 --- a/keystone/test/__init__.py +++ b/keystone/test/__init__.py @@ -581,7 +581,7 @@ class UnitTests(KeystoneTest): if not scoped_to_unit: argv.append('keystone.test.unit') - super(UnitTests, self).run(args=argv) + return super(UnitTests, self).run(args=argv) class ClientTests(KeystoneTest): @@ -620,7 +620,7 @@ class ClientTests(KeystoneTest): self.startServer() - super(ClientTests, self).run(args=argv) + return super(ClientTests, self).run(args=argv) class SQLTest(KeystoneTest): diff --git a/keystone/test/unit/test_backends.py b/keystone/test/unit/test_backends.py index fd746935..27837065 100644 --- a/keystone/test/unit/test_backends.py +++ b/keystone/test/unit/test_backends.py @@ -185,7 +185,8 @@ class SQLiteBackendTestCase(BackendTestCase): "hash-password": "False", 'keystone.backends.sqlalchemy': { "sql_connection": "sqlite:///%s" % self.database_name, - "backend_entities": "['Tenant']", + "backend_entities": "['Service', 'Tenant',\ + 'EndpointTemplates', 'Endpoints']", "sql_idle_timeout": "30" } } |