summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-09-20 17:02:32 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-09-20 17:02:32 -0400
commitfc93548e99dea561dbf2f198b0fccc84467dbf8b (patch)
tree703ba5549feab43d38f0e6c013cb03497675e4e9
parent7437df558f3277e21a4c34a5b517a1cae5dd5a74 (diff)
downloadnova-fc93548e99dea561dbf2f198b0fccc84467dbf8b.tar.gz
nova-fc93548e99dea561dbf2f198b0fccc84467dbf8b.tar.xz
nova-fc93548e99dea561dbf2f198b0fccc84467dbf8b.zip
Undo run_tests.py modification in the hopes of making this merge
-rw-r--r--run_tests.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/run_tests.py b/run_tests.py
index cf37b820e..77aa9088a 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -50,10 +50,8 @@ from nova import flags
from nova import twistd
from nova.tests.access_unittest import *
-from nova.tests.api_unittest import *
-from nova.tests.api import *
-from nova.tests.api.rackspace import *
from nova.tests.auth_unittest import *
+from nova.tests.api_unittest import *
from nova.tests.cloud_unittest import *
from nova.tests.compute_unittest import *
from nova.tests.flags_unittest import *