diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-07 18:13:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-07 18:13:48 +0000 |
| commit | 0b28e574afa8563524e21d31d95972c8ba126de2 (patch) | |
| tree | f093132f890b76bb500898f6a3d3102e849fe26d /nova/test.py | |
| parent | 0c78c2ed61c84ff967c2e6894f5dcff0987c2dec (diff) | |
| parent | f845891184b17e2c31a2b02dbc9217978abd3242 (diff) | |
| download | nova-0b28e574afa8563524e21d31d95972c8ba126de2.tar.gz nova-0b28e574afa8563524e21d31d95972c8ba126de2.tar.xz nova-0b28e574afa8563524e21d31d95972c8ba126de2.zip | |
Merge "First steps towards consolidating testing infrastructure"
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/test.py b/nova/test.py index 6c565f53d..448af047e 100644 --- a/nova/test.py +++ b/nova/test.py @@ -35,12 +35,12 @@ import nova.image.fake import shutil import stubout -from nova import fakerabbit from nova import flags from nova import log from nova import rpc from nova import utils from nova import service +from nova.testing.fake import rabbit from nova.virt import fake @@ -142,7 +142,7 @@ class TestCase(unittest.TestCase): finally: # Clean out fake_rabbit's queue if we used it if FLAGS.fake_rabbit: - fakerabbit.reset_all() + rabbit.reset_all() if FLAGS.connection_type == 'fake': if hasattr(fake.FakeConnection, '_instance'): |