summaryrefslogtreecommitdiffstats
path: root/nova/test.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-08-17 17:58:52 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-08-17 17:58:52 -0700
commitcdcbd516f62290697643eecc56550460bd48ff14 (patch)
tree798d4da90b8025b041a3f2b5efe86f3e33e8ef53 /nova/test.py
parent1cd448f907e132c451d6b27c64d16c17b7530952 (diff)
parent018ce9abbfb7047eff1e99379fba098a365e89eb (diff)
downloadnova-cdcbd516f62290697643eecc56550460bd48ff14.tar.gz
nova-cdcbd516f62290697643eecc56550460bd48ff14.tar.xz
nova-cdcbd516f62290697643eecc56550460bd48ff14.zip
merged trunk
Diffstat (limited to 'nova/test.py')
-rw-r--r--nova/test.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/test.py b/nova/test.py
index 9cb826253..4eb5c1c53 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -22,11 +22,11 @@ Allows overriding of flags for use of fakes,
and some black magic for inline callbacks.
"""
-import mox
-import stubout
import sys
import time
+import mox
+import stubout
from tornado import ioloop
from twisted.internet import defer
from twisted.trial import unittest
@@ -97,7 +97,6 @@ class TrialTestCase(unittest.TestCase):
setattr(FLAGS, k, v)
-
class BaseTestCase(TrialTestCase):
# TODO(jaypipes): Can this be moved into the TrialTestCase class?
"""Base test case class for all unit tests."""