summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-09-13 12:21:48 +0000
committerTarmac <>2011-09-13 12:21:48 +0000
commite7a2dddd0c5fd4d995e5e81c8d7bfe3fd7e775ca (patch)
treeee12567e06b96654f39566b72ccd6e9eef9165fe
parent9f39ff070b5500a0ccb9a6454995f97342254381 (diff)
parenta5c654884abee43760f4b43368f352272ae090dd (diff)
downloadnova-e7a2dddd0c5fd4d995e5e81c8d7bfe3fd7e775ca.tar.gz
nova-e7a2dddd0c5fd4d995e5e81c8d7bfe3fd7e775ca.tar.xz
nova-e7a2dddd0c5fd4d995e5e81c8d7bfe3fd7e775ca.zip
Moving tests/test_cloud.py to tests/api/ec2/test_cloud.py. They are EC2-specific tests, so this makes sense.
-rw-r--r--nova/tests/api/ec2/public_key/dummy.fingerprint (renamed from nova/tests/public_key/dummy.fingerprint)0
-rw-r--r--nova/tests/api/ec2/public_key/dummy.pub (renamed from nova/tests/public_key/dummy.pub)0
-rw-r--r--nova/tests/api/ec2/test_cloud.py (renamed from nova/tests/test_cloud.py)0
-rw-r--r--nova/tests/test_direct.py2
4 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/public_key/dummy.fingerprint b/nova/tests/api/ec2/public_key/dummy.fingerprint
index 715bca27a..715bca27a 100644
--- a/nova/tests/public_key/dummy.fingerprint
+++ b/nova/tests/api/ec2/public_key/dummy.fingerprint
diff --git a/nova/tests/public_key/dummy.pub b/nova/tests/api/ec2/public_key/dummy.pub
index d4cf2bc0d..d4cf2bc0d 100644
--- a/nova/tests/public_key/dummy.pub
+++ b/nova/tests/api/ec2/public_key/dummy.pub
diff --git a/nova/tests/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 7fe353b3d..7fe353b3d 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
diff --git a/nova/tests/test_direct.py b/nova/tests/test_direct.py
index 4ed0c2aa5..8d856dc4b 100644
--- a/nova/tests/test_direct.py
+++ b/nova/tests/test_direct.py
@@ -30,7 +30,7 @@ from nova import test
from nova import volume
from nova import utils
from nova.api import direct
-from nova.tests import test_cloud
+from nova.tests.api.ec2 import test_cloud
class ArbitraryObject(object):