From f845891184b17e2c31a2b02dbc9217978abd3242 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <duncan@dreamhost.com>
Date: Mon, 21 Nov 2011 19:59:50 -0800
Subject: 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
---
 nova/api/ec2/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

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)
-- 
cgit