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/api | |
| parent | 82d80e529916788c6f9354146e8842d2adb9bd29 (diff) | |
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/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 23042dab0..0433d5152 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -120,7 +120,7 @@ class Lockout(wsgi.Middleware): if FLAGS.memcached_servers: import memcache else: - from nova import fakememcache as memcache + from nova.testing.fake import memcache self.mc = memcache.Client(FLAGS.memcached_servers, debug=0) super(Lockout, self).__init__(application) |