summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-02-17 23:09:06 -0600
committerCerberus <matt.dietz@rackspace.com>2011-02-17 23:09:06 -0600
commit4b51ec3e9bca7421c66816c77c43396e51e68ea6 (patch)
treec96aae0accec4be79c2ec4c098e366a20862778a /nova/tests
parent88aa545b53d96c25da01218c79e8be8c1ae3370f (diff)
Tests
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/common.py8
-rw-r--r--nova/tests/test_compute.py7
2 files changed, 12 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/common.py b/nova/tests/api/openstack/common.py
index b55d3087b..66207cddc 100644
--- a/nova/tests/api/openstack/common.py
+++ b/nova/tests/api/openstack/common.py
@@ -21,10 +21,12 @@ import webob
def webob_factory(url):
base_url = url
- def web_request(url, method, body=None):
+ def web_request(url, method=None, body=None):
req = webob.Request.blank("%s%s" % (base_url, url))
- req.method = method
- req.body = json.dumps(body)
+ if method:
+ req.method = method
+ if body:
+ req.body = json.dumps(body)
return req
return web_request
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 2aa0690e7..e27e08827 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -258,3 +258,10 @@ class ComputeTestCase(test.TestCase):
self.assertEqual(ret_val, None)
self.compute.terminate_instance(self.context, instance_id)
+
+ def test_resize_instance(self):
+ """Ensure instance can be migrated/resized"""
+ instance_id = self._create_instance()
+ self.compute.run_instnce(self.context, instance_id)
+ self.compute.prep_resize(self.context, instance_id)
+