From fb70b8cde352bd00d737e13b94fbaacde84ff7e9 Mon Sep 17 00:00:00 2001
From: Ziad Sawalha <github@highbridgellc.com>
Date: Mon, 5 Dec 2011 19:17:38 -0600
Subject: Fixes missed tests and subsequently introduced bugs

- bug 900514 fixed: some test files were marked as
  executable. Nose by default skips those. They've
  been reset to 644.
- bug 900525 was introduced in the refactoring of
  the backend code. The test was not impacted but
  the load fixture code was. This has been addressed
  and the test passes again. No nchanges needed to
  the code being tested (i.e. no bugs introduced)

Change-Id: I87ee799a47f90c383e181d203fd783c77fa4b3e5
---
 keystone/test/__init__.py                       | 2 +-
 keystone/test/functional/test_authentication.py | 0
 keystone/test/functional/test_endpoints.py      | 0
 keystone/test/functional/test_roles.py          | 0
 keystone/test/functional/test_services.py       | 0
 keystone/test/functional/test_tenants.py        | 0
 keystone/test/functional/test_token.py          | 0
 keystone/test/functional/test_users.py          | 0
 keystone/test/unit/base.py                      | 4 +++-
 keystone/test/unit/test_auth.py                 | 0
 keystone/test/unit/test_ec2_authn.py            | 0
 keystone/test/unit/test_server.py               | 0
 12 files changed, 4 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 keystone/test/functional/test_authentication.py
 mode change 100755 => 100644 keystone/test/functional/test_endpoints.py
 mode change 100755 => 100644 keystone/test/functional/test_roles.py
 mode change 100755 => 100644 keystone/test/functional/test_services.py
 mode change 100755 => 100644 keystone/test/functional/test_tenants.py
 mode change 100755 => 100644 keystone/test/functional/test_token.py
 mode change 100755 => 100644 keystone/test/functional/test_users.py
 mode change 100755 => 100644 keystone/test/unit/test_auth.py
 mode change 100755 => 100644 keystone/test/unit/test_ec2_authn.py
 mode change 100755 => 100644 keystone/test/unit/test_server.py

diff --git a/keystone/test/__init__.py b/keystone/test/__init__.py
index fdd24a6d..915eaf15 100644
--- a/keystone/test/__init__.py
+++ b/keystone/test/__init__.py
@@ -68,7 +68,7 @@ from keystone.common import config, wsgi
 from keystone import backends
 
 TEST_DIR = os.path.abspath(os.path.dirname(__file__))
-BASE_DIR = os.path.abspath(os.path.join(TEST_DIR, '..', '..'))
+BASE_DIR = os.path.abspath(os.path.join(TEST_DIR, os.pardir, os.pardir))
 TEST_CERT = os.path.join(BASE_DIR, 'examples/ssl/certs/middleware-key.pem')
 
 
diff --git a/keystone/test/functional/test_authentication.py b/keystone/test/functional/test_authentication.py
old mode 100755
new mode 100644
diff --git a/keystone/test/functional/test_endpoints.py b/keystone/test/functional/test_endpoints.py
old mode 100755
new mode 100644
diff --git a/keystone/test/functional/test_roles.py b/keystone/test/functional/test_roles.py
old mode 100755
new mode 100644
diff --git a/keystone/test/functional/test_services.py b/keystone/test/functional/test_services.py
old mode 100755
new mode 100644
diff --git a/keystone/test/functional/test_tenants.py b/keystone/test/functional/test_tenants.py
old mode 100755
new mode 100644
diff --git a/keystone/test/functional/test_token.py b/keystone/test/functional/test_token.py
old mode 100755
new mode 100644
diff --git a/keystone/test/functional/test_users.py b/keystone/test/functional/test_users.py
old mode 100755
new mode 100644
diff --git a/keystone/test/unit/base.py b/keystone/test/unit/base.py
index ba52554c..fe89d362 100644
--- a/keystone/test/unit/base.py
+++ b/keystone/test/unit/base.py
@@ -33,6 +33,7 @@ import webob
 from keystone import server
 import keystone.backends.sqlalchemy as db
 import keystone.backends.api as db_api
+from keystone import backends
 
 logger = logging.getLogger('test.unit.base')
 
@@ -138,7 +139,8 @@ class ServiceAPITest(unittest.TestCase):
         db.unregister_models()
         logger.debug("Cleared all data from database")
         opts = self.options
-        db.register_models(options=opts['keystone.backends.sqlalchemy'])
+        reload(db)
+        backends.configure_backends(opts)
 
     def fixture_create_credentials(self, **kwargs):
         """
diff --git a/keystone/test/unit/test_auth.py b/keystone/test/unit/test_auth.py
old mode 100755
new mode 100644
diff --git a/keystone/test/unit/test_ec2_authn.py b/keystone/test/unit/test_ec2_authn.py
old mode 100755
new mode 100644
diff --git a/keystone/test/unit/test_server.py b/keystone/test/unit/test_server.py
old mode 100755
new mode 100644
-- 
cgit