diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-14 11:22:12 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-14 11:22:12 -0800 |
| commit | 9f84aff45733788546464329ea05ade653dcd1d4 (patch) | |
| tree | 265384c9736561375593ecf8ad3a7279baafbc37 | |
| parent | bf0d75e6f78bc3c66dce8481d44e52c40a9addb0 (diff) | |
| parent | f16030423d43272c5c3bea7fe51a0e03f0d95846 (diff) | |
merged trial fix again
| -rw-r--r-- | nova/test.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/test.py b/nova/test.py index a26b85b04..881baccd5 100644 --- a/nova/test.py +++ b/nova/test.py @@ -27,8 +27,6 @@ import unittest import mox import stubout -from twisted.internet import defer -from twisted.trial import unittest as trial_unittest from nova import context from nova import db @@ -36,6 +34,7 @@ from nova import fakerabbit from nova import flags from nova import rpc from nova.network import manager as network_manager +from nova.tests import fake_flags FLAGS = flags.FLAGS |