diff options
| author | Duncan McGreggor <duncan@dreamhost.com> | 2011-11-21 19:59:50 -0800 |
|---|---|---|
| committer | Duncan McGreggor <duncan@dreamhost.com> | 2011-12-06 09:37:57 -0800 |
| commit | f845891184b17e2c31a2b02dbc9217978abd3242 (patch) | |
| tree | 1aed11c2b270810e15179dfbc071d02f18e4dad4 /nova/auth | |
| parent | 82d80e529916788c6f9354146e8842d2adb9bd29 (diff) | |
| download | nova-f845891184b17e2c31a2b02dbc9217978abd3242.tar.gz nova-f845891184b17e2c31a2b02dbc9217978abd3242.tar.xz nova-f845891184b17e2c31a2b02dbc9217978abd3242.zip | |
First steps towards consolidating testing infrastructure
This commit begins to implement blueprint consolidate-testing-infrastructure by
adding a 'testing' subpackage and moving some modules into it.
Change-Id: I04bf860bc386bd2016e7dbc5a6f6ef7379a855bb
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/ldapdriver.py | 2 | ||||
| -rw-r--r-- | nova/auth/manager.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/auth/ldapdriver.py b/nova/auth/ldapdriver.py index bc37d2d87..6b9969dad 100644 --- a/nova/auth/ldapdriver.py +++ b/nova/auth/ldapdriver.py @@ -72,7 +72,7 @@ LOG = logging.getLogger("nova.ldapdriver") if FLAGS.memcached_servers: import memcache else: - from nova import fakememcache as memcache + from nova.testing.fake import memcache # TODO(vish): make an abstract base class with the same public methods diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 93b4244ad..3d984f1bf 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -82,7 +82,7 @@ LOG = logging.getLogger('nova.auth.manager') if FLAGS.memcached_servers: import memcache else: - from nova import fakememcache as memcache + from nova.testing.fake import memcache class AuthBase(object): |