From 6cd90a95d632d45d1c906d412e3240f730e88b95 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Fri, 11 Mar 2011 15:35:55 -0600
Subject: New migration

---
 nova/tests/test_compute.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 643b2e93a..3d25a8997 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -299,5 +299,3 @@ class ComputeTestCase(test.TestCase):
         self.assertRaises(exception.Error, self.compute.prep_resize,
                 self.context, instance_id)
         self.compute.terminate_instance(self.context, instance_id)
-        type = instance_types.get_by_flavor_id("1")
-        self.assertEqual(type, 'm1.tiny')
-- 
cgit 


From 1c4afe23157233b7081872ccbc6ea5fa1ff0015a Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Fri, 11 Mar 2011 17:30:51 -0600
Subject: Some unit tests

---
 nova/tests/test_compute.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 3d25a8997..c53284216 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -287,6 +287,30 @@ class ComputeTestCase(test.TestCase):
                 migration_ref['id'])
         self.compute.terminate_instance(context, instance_id)
 
+    def test_resize_invalid_flavor_fails(self):
+        """Ensure invalid flavors raise"""
+        instance_id = self._create_instance()
+        context = self.context.elevated()
+        self.compute.run_instance(self.context, instance_id)
+
+        self.assertRaises(exception.ApiError, self.compute_api.resize,
+                context, instance_id, 200)
+
+        self.compute.terminate_instance(context, instance_id)
+
+    def test_resize_down_fails(self):
+        """Ensure invalid flavors raise"""
+        instance_id = self._create_instance()
+        context = self.context.elevated()
+        self.compute.run_instance(self.context, instance_id)
+        db.instance_update(self.context, instance_id, 
+                {'instance_type': 'm1.large'})
+
+        self.assertRaises(exception.ApiError, self.compute_api.resize,
+                context, instance_id, 1)
+
+        self.compute.terminate_instance(context, instance_id)
+
     def test_get_by_flavor_id(self):
         type = instance_types.get_by_flavor_id(1)
         self.assertEqual(type, 'm1.tiny')
-- 
cgit 


From af5e752e8eb21d0e9192d9acd9e75586bdec3685 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 14 Mar 2011 11:55:55 -0500
Subject: Compute test

---
 nova/tests/test_compute.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index c53284216..47e0f66fb 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -76,6 +76,20 @@ class ComputeTestCase(test.TestCase):
         inst.update(params)
         return db.instance_create(self.context, inst)['id']
 
+    def _create_instance_type(self, params={}):
+        """Create a test instance"""
+        inst = {}
+        inst['name'] = 'm1.small'
+        inst['memory_mb'] = '1024'
+        inst['vcpus'] = '1'
+        inst['local_gb'] = '20'
+        inst['flavorid'] = '1'
+        inst['swap'] = '2048'
+        inst['rxtx_quota'] = 100
+        inst['rxtx_cap'] = 200
+        inst.update(params)
+        return db.instance_type_create(self.context, inst)['id']
+
     def _create_group(self):
         values = {'name': 'testgroup',
                   'description': 'testgroup',
@@ -301,10 +315,17 @@ class ComputeTestCase(test.TestCase):
     def test_resize_down_fails(self):
         """Ensure invalid flavors raise"""
         instance_id = self._create_instance()
+
+        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
+                memory_mb=512))
+        big_inst_type_id = self._create_instance_type(dict(flavorid=2,
+                name='m1.wowzers', memory_mb=8192))
+
         context = self.context.elevated()
         self.compute.run_instance(self.context, instance_id)
-        db.instance_update(self.context, instance_id, 
-                {'instance_type': 'm1.large'})
+        db.instance_update(self.context, instance_id,
+                {'instance_type': 'm1.wowzers',
+                 'memory_gb': 8192})
 
         self.assertRaises(exception.ApiError, self.compute_api.resize,
                 context, instance_id, 1)
-- 
cgit 


From 1ebae577150ce64d81d102c2e162acfe5a72528b Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 14 Mar 2011 12:07:27 -0500
Subject: Test changes

---
 nova/tests/test_compute.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 47e0f66fb..265421837 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -292,14 +292,18 @@ class ComputeTestCase(test.TestCase):
         """Ensure instance can be migrated/resized"""
         instance_id = self._create_instance()
         context = self.context.elevated()
+        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
+                memory_mb=512, name='m1.small'))
+
         self.compute.run_instance(self.context, instance_id)
         db.instance_update(self.context, instance_id, {'host': 'foo'})
-        self.compute.prep_resize(context, instance_id)
+        self.compute.prep_resize(context, instance_id, 1)
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance_id, 'pre-migrating')
         self.compute.resize_instance(context, instance_id,
                 migration_ref['id'])
         self.compute.terminate_instance(context, instance_id)
+        self.db.instance_type_purge(context, 'm1.small')
 
     def test_resize_invalid_flavor_fails(self):
         """Ensure invalid flavors raise"""
@@ -317,7 +321,7 @@ class ComputeTestCase(test.TestCase):
         instance_id = self._create_instance()
 
         small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512))
+                memory_mb=512, name='m1.small'))
         big_inst_type_id = self._create_instance_type(dict(flavorid=2,
                 name='m1.wowzers', memory_mb=8192))
 
@@ -331,6 +335,8 @@ class ComputeTestCase(test.TestCase):
                 context, instance_id, 1)
 
         self.compute.terminate_instance(context, instance_id)
+        self.db.instance_type_purge(context, 'm1.small')
+        self.db.instance_type_purge(context, 'm1.wowzers')
 
     def test_get_by_flavor_id(self):
         type = instance_types.get_by_flavor_id(1)
@@ -340,7 +346,10 @@ class ComputeTestCase(test.TestCase):
         """Ensure instance fails to migrate when source and destination are
         the same host"""
         instance_id = self._create_instance()
+        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
+                memory_mb=512, name='m1.small'))
         self.compute.run_instance(self.context, instance_id)
         self.assertRaises(exception.Error, self.compute.prep_resize,
-                self.context, instance_id)
+                self.context, instance_id, 1)
         self.compute.terminate_instance(self.context, instance_id)
+        self.db.instance_type_purge(context, 'm1.small')
-- 
cgit 


From e509cd70e7a2e8a430b2b24af50adcf1ad763564 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Mon, 14 Mar 2011 17:24:39 +0000
Subject: Test fixes and some typos

---
 nova/tests/test_compute.py | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 265421837..a6defd644 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -78,6 +78,7 @@ class ComputeTestCase(test.TestCase):
 
     def _create_instance_type(self, params={}):
         """Create a test instance"""
+        context = self.context.elevated()
         inst = {}
         inst['name'] = 'm1.small'
         inst['memory_mb'] = '1024'
@@ -88,7 +89,7 @@ class ComputeTestCase(test.TestCase):
         inst['rxtx_quota'] = 100
         inst['rxtx_cap'] = 200
         inst.update(params)
-        return db.instance_type_create(self.context, inst)['id']
+        return db.instance_type_create(context, inst)['id']
 
     def _create_group(self):
         values = {'name': 'testgroup',
@@ -292,8 +293,6 @@ class ComputeTestCase(test.TestCase):
         """Ensure instance can be migrated/resized"""
         instance_id = self._create_instance()
         context = self.context.elevated()
-        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512, name='m1.small'))
 
         self.compute.run_instance(self.context, instance_id)
         db.instance_update(self.context, instance_id, {'host': 'foo'})
@@ -303,7 +302,6 @@ class ComputeTestCase(test.TestCase):
         self.compute.resize_instance(context, instance_id,
                 migration_ref['id'])
         self.compute.terminate_instance(context, instance_id)
-        self.db.instance_type_purge(context, 'm1.small')
 
     def test_resize_invalid_flavor_fails(self):
         """Ensure invalid flavors raise"""
@@ -311,32 +309,24 @@ class ComputeTestCase(test.TestCase):
         context = self.context.elevated()
         self.compute.run_instance(self.context, instance_id)
 
-        self.assertRaises(exception.ApiError, self.compute_api.resize,
+        self.assertRaises(exception.NotFound, self.compute_api.resize,
                 context, instance_id, 200)
 
         self.compute.terminate_instance(context, instance_id)
 
     def test_resize_down_fails(self):
         """Ensure invalid flavors raise"""
+        context = self.context.elevated()
         instance_id = self._create_instance()
 
-        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512, name='m1.small'))
-        big_inst_type_id = self._create_instance_type(dict(flavorid=2,
-                name='m1.wowzers', memory_mb=8192))
-
-        context = self.context.elevated()
         self.compute.run_instance(self.context, instance_id)
         db.instance_update(self.context, instance_id,
-                {'instance_type': 'm1.wowzers',
-                 'memory_gb': 8192})
+                {'instance_type': 'm1.xlarge'})
 
         self.assertRaises(exception.ApiError, self.compute_api.resize,
                 context, instance_id, 1)
 
         self.compute.terminate_instance(context, instance_id)
-        self.db.instance_type_purge(context, 'm1.small')
-        self.db.instance_type_purge(context, 'm1.wowzers')
 
     def test_get_by_flavor_id(self):
         type = instance_types.get_by_flavor_id(1)
@@ -346,10 +336,7 @@ class ComputeTestCase(test.TestCase):
         """Ensure instance fails to migrate when source and destination are
         the same host"""
         instance_id = self._create_instance()
-        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512, name='m1.small'))
         self.compute.run_instance(self.context, instance_id)
         self.assertRaises(exception.Error, self.compute.prep_resize,
                 self.context, instance_id, 1)
         self.compute.terminate_instance(self.context, instance_id)
-        self.db.instance_type_purge(context, 'm1.small')
-- 
cgit 


From 738653b6b4ac744519a050fe50e7c795a7c63579 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Mon, 14 Mar 2011 15:11:14 -0700
Subject: Added test and fixed up code so that it works

---
 nova/tests/test_compute.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index e486050be..b9d0aa0b6 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -595,3 +595,24 @@ class ComputeTestCase(test.TestCase):
         db.instance_destroy(c, instance_id)
         db.volume_destroy(c, v_ref['id'])
         db.floating_ip_destroy(c, flo_addr)
+
+    def test_run_kill_vm(self):
+        """Detect when a vm is terminated behind the scenes"""
+        instance_id = self._create_instance()
+
+        self.compute.run_instance(self.context, instance_id)
+
+        instances = db.instance_get_all(context.get_admin_context())
+        LOG.info(_("Running instances: %s"), instances)
+        self.assertEqual(len(instances), 1)
+
+        instance_name = instances[0].name
+        self.compute.driver.test_remove_vm(instance_name)
+
+        # Force the compute manager to do its periodic poll
+        error_list = self.compute.periodic_tasks(context.get_admin_context())
+        self.assertFalse(error_list)
+
+        instances = db.instance_get_all(context.get_admin_context())
+        LOG.info(_("After force-killing instances: %s"), instances)
+        self.assertEqual(len(instances), 0)
-- 
cgit 


From cc2d4728d32d016ef803d0def456cac6e315e8fa Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Wed, 16 Mar 2011 17:56:40 -0400
Subject: get started testing

---
 nova/tests/image/__init__.py    |  0
 nova/tests/image/test_glance.py | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 nova/tests/image/__init__.py
 create mode 100644 nova/tests/image/test_glance.py

(limited to 'nova/tests')

diff --git a/nova/tests/image/__init__.py b/nova/tests/image/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
new file mode 100644
index 000000000..b568f593d
--- /dev/null
+++ b/nova/tests/image/test_glance.py
@@ -0,0 +1,18 @@
+import unittest
+
+from nova.image import glance
+
+class StubGlanceClient(object):
+
+    def __init__(self, images):
+        self._images = images
+
+    def get_image_meta(id):
+        return self._images[id]
+
+class TestGlance(unittest.TestCase):
+
+    def test(self):
+        images = {'xyz': "image"}
+        client = StubGlanceClient(images)
+        service = glance.GlanceImageService(client)
-- 
cgit 


From 11698a131fe6b99bfd91a977a975b07bcd4c2b2b Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Thu, 17 Mar 2011 03:21:09 -0400
Subject: Added mechanism for versioned controllers for openstack api versions
 1.0/1.1. Create servers in the 1.1 api now supports imageRef/flavorRef
 instead of imageId/flavorId.

---
 nova/tests/api/openstack/fakes.py        | 18 +++++---
 nova/tests/api/openstack/test_auth.py    |  6 +--
 nova/tests/api/openstack/test_servers.py | 73 +++++++++++++++++++++++++++++---
 3 files changed, 79 insertions(+), 18 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index a3968b57b..370eb68cb 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -76,14 +76,18 @@ def fake_wsgi(self, req):
     return self.application
 
 
-def wsgi_app(inner_application=None):
-    if not inner_application:
-        inner_application = openstack.APIRouter()
+def wsgi_app(inner_app10=None, inner_app11=None):
+    if not inner_app10:
+        inner_app10 = openstack.APIRouterV10()
+    if not inner_app11:
+        inner_app11 = openstack.APIRouterV11()
     mapper = urlmap.URLMap()
-    api = openstack.FaultWrapper(auth.AuthMiddleware(
-              ratelimiting.RateLimitingMiddleware(inner_application)))
-    mapper['/v1.0'] = api
-    mapper['/v1.1'] = api
+    api10 = openstack.FaultWrapper(auth.AuthMiddleware(
+              ratelimiting.RateLimitingMiddleware(inner_app10)))
+    api11 = openstack.FaultWrapper(auth.AuthMiddleware(
+              ratelimiting.RateLimitingMiddleware(inner_app11)))
+    mapper['/v1.0'] = api10
+    mapper['/v1.1'] = api11
     mapper['/'] = openstack.FaultWrapper(openstack.Versions())
     return mapper
 
diff --git a/nova/tests/api/openstack/test_auth.py b/nova/tests/api/openstack/test_auth.py
index aaaa4e415..b7f0dfbe5 100644
--- a/nova/tests/api/openstack/test_auth.py
+++ b/nova/tests/api/openstack/test_auth.py
@@ -82,8 +82,7 @@ class Test(test.TestCase):
         self.assertEqual(result.headers['X-Storage-Url'], "")
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter',
-            fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack, 'APIRouterV10', fakes.FakeRouter)
         req = webob.Request.blank('/v1.0/fake')
         req.headers['X-Auth-Token'] = token
         result = req.get_response(fakes.wsgi_app())
@@ -189,8 +188,7 @@ class TestLimiter(test.TestCase):
         self.assertEqual(len(result.headers['X-Auth-Token']), 40)
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter',
-            fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack, 'APIRouterV10', fakes.FakeRouter)
         req = webob.Request.blank('/v1.0/fake')
         req.method = 'POST'
         req.headers['X-Auth-Token'] = token
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 27d174fe9..0116bbed1 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -158,7 +158,7 @@ class ServersTest(test.TestCase):
         req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
-        self.assertEqual(res_dict['server']['id'], '1')
+        self.assertEqual(res_dict['server']['id'], 1)
         self.assertEqual(res_dict['server']['name'], 'server1')
 
     def test_get_server_by_id_with_addresses(self):
@@ -169,7 +169,7 @@ class ServersTest(test.TestCase):
         req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
-        self.assertEqual(res_dict['server']['id'], '1')
+        self.assertEqual(res_dict['server']['id'], 1)
         self.assertEqual(res_dict['server']['name'], 'server1')
         addresses = res_dict['server']['addresses']
         self.assertEqual(len(addresses["public"]), len(public))
@@ -177,7 +177,7 @@ class ServersTest(test.TestCase):
         self.assertEqual(len(addresses["private"]), 1)
         self.assertEqual(addresses["private"][0], private)
 
-    def test_get_server_by_id_with_addresses_v1_1(self):
+    def test_get_server_by_id_with_addresses_v11(self):
         private = "192.168.0.3"
         public = ["1.2.3.4"]
         new_return_server = return_server_with_addresses(private, public)
@@ -186,7 +186,7 @@ class ServersTest(test.TestCase):
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
-        self.assertEqual(res_dict['server']['id'], '1')
+        self.assertEqual(res_dict['server']['id'], 1)
         self.assertEqual(res_dict['server']['name'], 'server1')
         addresses = res_dict['server']['addresses']
         self.assertEqual(len(addresses["public"]), len(public))
@@ -273,13 +273,13 @@ class ServersTest(test.TestCase):
             "get_image_id_from_image_hash", image_id_from_hash)
 
         body = dict(server=dict(
-            name='server_test', imageId=2, flavorId=2,
+            name='server_test', imageId=3, flavorId=2,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
         req = webob.Request.blank('/v1.0/servers')
         req.method = 'POST'
         req.body = json.dumps(body)
-        req.headers["Content-Type"] = "application/json"
+        req.headers["content-type"] = "application/json"
 
         res = req.get_response(fakes.wsgi_app())
 
@@ -287,8 +287,67 @@ class ServersTest(test.TestCase):
         self.assertEqual('serv', server['adminPass'][:4])
         self.assertEqual(16, len(server['adminPass']))
         self.assertEqual('server_test', server['name'])
-        self.assertEqual('1', server['id'])
+        self.assertEqual(1, server['id'])
+        self.assertEqual(2, server['flavorId'])
+        self.assertEqual(3, server['imageId'])
+        self.assertEqual(res.status_int, 200)
+
+    def test_create_instance_v11(self):
+        def instance_create(context, inst):
+            return {'id': '1', 'display_name': 'server_test'}
+
+        def server_update(context, id, params):
+            return instance_create(context, id)
+
+        def fake_method(*args, **kwargs):
+            pass
+
+        def project_get_network(context, user_id):
+            return dict(id='1', host='localhost')
+
+        def queue_get_for(context, *args):
+            return 'network_topic'
+
+        def kernel_ramdisk_mapping(*args, **kwargs):
+            return (1, 1)
+
+        def image_id_from_hash(*args, **kwargs):
+            return 2
+
+        self.stubs.Set(nova.db.api, 'project_get_network', project_get_network)
+        self.stubs.Set(nova.db.api, 'instance_create', instance_create)
+        self.stubs.Set(nova.rpc, 'cast', fake_method)
+        self.stubs.Set(nova.rpc, 'call', fake_method)
+        self.stubs.Set(nova.db.api, 'instance_update',
+            server_update)
+        self.stubs.Set(nova.db.api, 'queue_get_for', queue_get_for)
+        self.stubs.Set(nova.network.manager.VlanManager, 'allocate_fixed_ip',
+            fake_method)
+        self.stubs.Set(nova.api.openstack.servers.Controller,
+            "_get_kernel_ramdisk_from_image", kernel_ramdisk_mapping)
+        self.stubs.Set(nova.api.openstack.common,
+            "get_image_id_from_image_hash", image_id_from_hash)
 
+        imageRef = 'http://localhost/v1.1/images/2'
+        flavorRef = 'http://localhost/v1.1/flavors/3'
+        body = dict(server=dict(
+            name='server_test', imageRef=imageRef, flavorRef=flavorRef,
+            metadata={'hello': 'world', 'open': 'stack'},
+            personality={}))
+        req = webob.Request.blank('/v1.1/servers')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        res = req.get_response(fakes.wsgi_app())
+
+        server = json.loads(res.body)['server']
+        self.assertEqual('serv', server['adminPass'][:4])
+        self.assertEqual(16, len(server['adminPass']))
+        self.assertEqual('server_test', server['name'])
+        self.assertEqual(1, server['id'])
+        self.assertEqual(flavorRef, server['flavorRef'])
+        self.assertEqual(imageRef, server['imageRef'])
         self.assertEqual(res.status_int, 200)
 
     def test_update_no_body(self):
-- 
cgit 


From e79eaca86c4073cc8bc6c59be83d0f1bf5e2cea4 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Thu, 17 Mar 2011 12:20:22 -0400
Subject: glance image service show testcases

---
 nova/tests/image/test_glance.py | 64 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 7 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index b568f593d..971a32a17 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -1,3 +1,4 @@
+import datetime as dt
 import unittest
 
 from nova.image import glance
@@ -5,14 +6,63 @@ from nova.image import glance
 class StubGlanceClient(object):
 
     def __init__(self, images):
-        self._images = images
+        self.images = images
 
-    def get_image_meta(id):
-        return self._images[id]
+    def get_image_meta(self, id):
+        return self.images[id]
+
+    def get_images_detailed(self):
+        return self.images
 
 class TestGlance(unittest.TestCase):
 
-    def test(self):
-        images = {'xyz': "image"}
-        client = StubGlanceClient(images)
-        service = glance.GlanceImageService(client)
+    def setUp(self):
+        self.client = StubGlanceClient(None)
+        self.service = glance.GlanceImageService(self.client)
+
+    def test_show_passes_through_to_client(self):
+        self.client.images = {'xyz': "image"}
+        self.assertEqual(self.service.show({}, 'xyz'), "image")
+
+    def test_detail_passes_through_to_client(self):
+        self.client.images = "these are the images"
+        self.assertEqual(self.service.detail({}), self.client.images)
+
+    def test_show_makes_create_datetimes(self):
+        create_time = dt.datetime.utcnow()
+        self.client.images = {'xyz': {
+            'id': "id",
+            'name': "my awesome image",
+            'created_at': create_time.isoformat(),
+        }}
+        actual = self.service.show({}, 'xyz')
+        self.assertEqual(actual['created_at'], create_time)
+
+    def test_show_makes_update_datetimes(self):
+        update_time = dt.datetime.utcnow()
+        self.client.images = {'abc': {
+            'id': "id",
+            'name': "my okay image",
+            'updated_at': update_time.isoformat(),
+        }}
+        actual = self.service.show({}, 'abc')
+        self.assertEqual(actual['updated_at'], update_time)
+
+    def test_show_makes_delete_datetimes(self):
+        delete_time = dt.datetime.utcnow()
+        self.client.images = {'123': {
+            'id': "123",
+            'name': "my lame image",
+            'deleted_at': delete_time.isoformat(),
+        }}
+        actual = self.service.show({}, '123')
+        self.assertEqual(actual['deleted_at'], delete_time)
+
+    def test_show_handles_deleted_at_none(self):
+        self.client.images = {'747': {
+            'id': "747",
+            'name': "not deleted",
+            'deleted_at': None,
+        }}
+        actual = self.service.show({}, '747')
+        self.assertEqual(actual['deleted_at'], None)
-- 
cgit 


From 3ee835c60d2b43086b1e324501025d1f0221da27 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Thu, 17 Mar 2011 13:50:41 -0400
Subject: handle timestamps in glance service detail

---
 nova/tests/image/test_glance.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 971a32a17..16fe0e7c0 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -12,7 +12,7 @@ class StubGlanceClient(object):
         return self.images[id]
 
     def get_images_detailed(self):
-        return self.images
+        return self.images.itervalues()
 
 class TestGlance(unittest.TestCase):
 
@@ -25,8 +25,8 @@ class TestGlance(unittest.TestCase):
         self.assertEqual(self.service.show({}, 'xyz'), "image")
 
     def test_detail_passes_through_to_client(self):
-        self.client.images = "these are the images"
-        self.assertEqual(self.service.detail({}), self.client.images)
+        self.client.images = {1: "an image"}
+        self.assertEqual(list(self.service.detail({})), ["an image"])
 
     def test_show_makes_create_datetimes(self):
         create_time = dt.datetime.utcnow()
@@ -66,3 +66,24 @@ class TestGlance(unittest.TestCase):
         }}
         actual = self.service.show({}, '747')
         self.assertEqual(actual['deleted_at'], None)
+
+    def test_detail_handles_timestamps(self):
+        now = dt.datetime.utcnow()
+        image1 = {
+            'id': 1,
+            'name': 'image 1',
+            'created_at': now.isoformat(),
+            'updated_at': now.isoformat(),
+            'deleted_at': None,
+        }
+        image2 = {
+            'id': 2,
+            'name': 'image 2',
+            'deleted_at': now.isoformat(),
+        }
+        self.client.images = {1: image1, 2: image2}
+        i1, i2 = self.service.detail({})
+        self.assertEqual(i1['created_at'], now)
+        self.assertEqual(i1['updated_at'], now)
+        self.assertEqual(i1['deleted_at'], None)
+        self.assertEqual(i2['deleted_at'], now)
-- 
cgit 


From 66c237a4d321887830e5282781870525abf00365 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Thu, 17 Mar 2011 14:04:31 -0400
Subject: teach glance image server get to handle timestamps

---
 nova/tests/image/test_glance.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 16fe0e7c0..1e6c45219 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -14,7 +14,17 @@ class StubGlanceClient(object):
     def get_images_detailed(self):
         return self.images.itervalues()
 
-class TestGlance(unittest.TestCase):
+    def get_image(self, id):
+        return self.images[id], []
+
+
+class NullWriter(object):
+
+    def write(self, *arg, **kwargs):
+        pass
+
+
+class TestGlanceImageServiceDatetimes(unittest.TestCase):
 
     def setUp(self):
         self.client = StubGlanceClient(None)
@@ -87,3 +97,21 @@ class TestGlance(unittest.TestCase):
         self.assertEqual(i1['updated_at'], now)
         self.assertEqual(i1['deleted_at'], None)
         self.assertEqual(i2['deleted_at'], now)
+
+    def test_get_handles_timestamps(self):
+        now = dt.datetime.utcnow()
+        self.client.images = {'abcd': {
+            'id': 'abcd',
+            'name': 'nifty image',
+            'created_at': now.isoformat(),
+            'updated_at': now.isoformat(),
+            'deleted_at': now.isoformat(),
+        }}
+        actual = self.service.get({}, 'abcd', NullWriter())
+        for attr in ('created_at', 'updated_at', 'deleted_at'):
+            self.assertEqual(actual[attr], now)
+
+    def test_get_handles_deleted_at_none(self):
+        self.client.images = {'abcd': {'deleted_at': None}}
+        actual = self.service.get({}, 'abcd', NullWriter())
+        self.assertEqual(actual['deleted_at'], None)
-- 
cgit 


From c8e474d04dce462650c2a9f57cbcb106ce3ef0c9 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Thu, 17 Mar 2011 14:05:08 -0400
Subject: pep8

---
 nova/tests/image/test_glance.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 1e6c45219..9b17cf261 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -3,6 +3,7 @@ import unittest
 
 from nova.image import glance
 
+
 class StubGlanceClient(object):
 
     def __init__(self, images):
-- 
cgit 


From 4334ca9d6b0ac8a9b2edb1fbcbf0bc4df28b2961 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Thu, 17 Mar 2011 15:04:28 -0400
Subject: get api openstack test_images working

---
 nova/tests/api/openstack/test_images.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 76f758929..47dd11e5b 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -182,8 +182,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         {'id': '23g2ogk23k4hhkk4k42l',
          'imageId': '23g2ogk23k4hhkk4k42l',
          'name': 'public image #1',
-         'created_at': str(datetime.datetime.utcnow()),
-         'updated_at': str(datetime.datetime.utcnow()),
+         'created_at': datetime.datetime.utcnow().isoformat(),
+         'updated_at': datetime.datetime.utcnow().isoformat(),
          'deleted_at': None,
          'deleted': False,
          'is_public': True,
@@ -192,8 +192,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         {'id': 'slkduhfas73kkaskgdas',
          'imageId': 'slkduhfas73kkaskgdas',
          'name': 'public image #2',
-         'created_at': str(datetime.datetime.utcnow()),
-         'updated_at': str(datetime.datetime.utcnow()),
+         'created_at': datetime.datetime.utcnow().isoformat(),
+         'updated_at': datetime.datetime.utcnow().isoformat(),
          'deleted_at': None,
          'deleted': False,
          'is_public': True,
-- 
cgit 


From 2f1a1d293915cde6e15c85e0bb43fb21ae26f7b0 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Thu, 17 Mar 2011 15:29:54 -0400
Subject: handle create and update requests, and update the base image service
 documentation to reflect the (defacto) behavior

---
 nova/tests/image/test_glance.py | 54 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 9b17cf261..6e94aa909 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -6,8 +6,10 @@ from nova.image import glance
 
 class StubGlanceClient(object):
 
-    def __init__(self, images):
+    def __init__(self, images, add_response=None, update_response=None):
         self.images = images
+        self.add_response = add_response
+        self.update_response = update_response
 
     def get_image_meta(self, id):
         return self.images[id]
@@ -18,6 +20,12 @@ class StubGlanceClient(object):
     def get_image(self, id):
         return self.images[id], []
 
+    def add_image(self, metadata, data):
+        return self.add_response
+
+    def update_image(self, image_id, metadata, data):
+        return self.update_response
+
 
 class NullWriter(object):
 
@@ -116,3 +124,47 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.client.images = {'abcd': {'deleted_at': None}}
         actual = self.service.get({}, 'abcd', NullWriter())
         self.assertEqual(actual['deleted_at'], None)
+
+    def test_create_handles_timestamps(self):
+        now = dt.datetime.utcnow()
+        self.client.add_response = {
+            'id': 'abcd',
+            'name': 'blah',
+            'created_at': now.isoformat(),
+            'updated_at': now.isoformat(),
+            'deleted_at': now.isoformat(),
+        }
+        actual = self.service.create({}, {})
+        for attr in ('created_at', 'updated_at', 'deleted_at'):
+            self.assertEqual(actual[attr], now)
+
+    def test_create_handles_deleted_at_none(self):
+        self.client.add_response = {
+            'id': 'abcd',
+            'name': 'blah',
+            'deleted_at': None,
+        }
+        actual = self.service.create({}, {})
+        self.assertEqual(actual['deleted_at'], None)
+
+    def test_update_handles_timestamps(self):
+        now = dt.datetime.utcnow()
+        self.client.update_response = {
+            'id': 'abcd',
+            'name': 'blah',
+            'created_at': now.isoformat(),
+            'updated_at': now.isoformat(),
+            'deleted_at': now.isoformat(),
+        }
+        actual = self.service.update({}, 'dummy_id', {})
+        for attr in ('created_at', 'updated_at', 'deleted_at'):
+            self.assertEqual(actual[attr], now)
+
+    def test_create_handles_deleted_at_none(self):
+        self.client.update_response = {
+            'id': 'abcd',
+            'name': 'blah',
+            'deleted_at': None,
+        }
+        actual = self.service.update({}, 'dummy_id', {})
+        self.assertEqual(actual['deleted_at'], None)
-- 
cgit 


From e138e0836922ee0608feefbff5e4e5d03ad14197 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Thu, 17 Mar 2011 16:02:37 -0400
Subject: Now returns a 400 for a create server request with invalid hrefs for
 imageRef/flavorRef values. Also added tests.

---
 nova/tests/api/openstack/test_servers.py | 64 +++++++++++++-------------------
 1 file changed, 25 insertions(+), 39 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 846af5c3a..6e78db9da 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -239,7 +239,7 @@ class ServersTest(test.TestCase):
         servers = json.loads(res.body)['servers']
         self.assertEqual([s['id'] for s in servers], [1, 2])
 
-    def _test_create_instance_helper(self):
+    def _setup_for_create_instance(self):
         """Shared implementation for tests below that create instance"""
         def instance_create(context, inst):
             return {'id': '1', 'display_name': 'server_test'}
@@ -276,6 +276,9 @@ class ServersTest(test.TestCase):
         self.stubs.Set(nova.api.openstack.common,
             "get_image_id_from_image_hash", image_id_from_hash)
 
+    def _test_create_instance_helper(self):
+        self._setup_for_create_instance()
+
         body = dict(server=dict(
             name='server_test', imageId=3, flavorId=2,
             metadata={'hello': 'world', 'open': 'stack'},
@@ -296,41 +299,15 @@ class ServersTest(test.TestCase):
         self.assertEqual(3, server['imageId'])
         self.assertEqual(res.status_int, 200)
 
-    def test_create_instance_v11(self):
-        def instance_create(context, inst):
-            return {'id': '1', 'display_name': 'server_test'}
-
-        def server_update(context, id, params):
-            return instance_create(context, id)
-
-        def fake_method(*args, **kwargs):
-            pass
-
-        def project_get_network(context, user_id):
-            return dict(id='1', host='localhost')
-
-        def queue_get_for(context, *args):
-            return 'network_topic'
-
-        def kernel_ramdisk_mapping(*args, **kwargs):
-            return (1, 1)
+    def test_create_instance(self):
+        self._test_create_instance_helper()
 
-        def image_id_from_hash(*args, **kwargs):
-            return 2
+    def test_create_instance_no_key_pair(self):
+        fakes.stub_out_key_pair_funcs(self.stubs, have_key_pair=False)
+        self._test_create_instance_helper()
 
-        self.stubs.Set(nova.db.api, 'project_get_network', project_get_network)
-        self.stubs.Set(nova.db.api, 'instance_create', instance_create)
-        self.stubs.Set(nova.rpc, 'cast', fake_method)
-        self.stubs.Set(nova.rpc, 'call', fake_method)
-        self.stubs.Set(nova.db.api, 'instance_update',
-            server_update)
-        self.stubs.Set(nova.db.api, 'queue_get_for', queue_get_for)
-        self.stubs.Set(nova.network.manager.VlanManager, 'allocate_fixed_ip',
-            fake_method)
-        self.stubs.Set(nova.api.openstack.servers.Controller,
-            "_get_kernel_ramdisk_from_image", kernel_ramdisk_mapping)
-        self.stubs.Set(nova.api.openstack.common,
-            "get_image_id_from_image_hash", image_id_from_hash)
+    def test_create_instance_v11(self):
+        self._setup_for_create_instance()
 
         imageRef = 'http://localhost/v1.1/images/2'
         flavorRef = 'http://localhost/v1.1/flavors/3'
@@ -354,12 +331,21 @@ class ServersTest(test.TestCase):
         self.assertEqual(imageRef, server['imageRef'])
         self.assertEqual(res.status_int, 200)
 
-    def test_create_instance(self):
-        self._test_create_instance_helper()
+    def test_create_instance_v11_bad_href(self):
+        self._setup_for_create_instance()
 
-    def test_create_instance_no_key_pair(self):
-        fakes.stub_out_key_pair_funcs(self.stubs, have_key_pair=False)
-        self._test_create_instance_helper()
+        imageRef = 'http://localhost/v1.1/images/asdf'
+        flavorRef = 'http://localhost/v1.1/flavors/3'
+        body = dict(server=dict(
+            name='server_test', imageRef=imageRef, flavorRef=flavorRef,
+            metadata={'hello': 'world', 'open': 'stack'},
+            personality={}))
+        req = webob.Request.blank('/v1.1/servers')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
 
     def test_update_no_body(self):
         req = webob.Request.blank('/v1.0/servers/1')
-- 
cgit 


From b605b53e4b652e0a3f364d505b5fd7240fd4ea36 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Thu, 17 Mar 2011 20:44:15 +0000
Subject: Test changes

---
 nova/tests/api/openstack/test_servers.py | 22 ++++++++++++----------
 nova/tests/xenapi/stubs.py               |  7 +++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 03e00af2a..14b72e097 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -491,16 +491,6 @@ class ServersTest(test.TestCase):
         req.body = json.dumps(body)
         res = req.get_response(fakes.wsgi_app())
 
-    def test_server_resize(self):
-        body = dict(server=dict(
-            name='server_test', imageId=2, flavorId=2, metadata={},
-            personality={}))
-        req = webob.Request.blank('/v1.0/servers/1/action')
-        req.method = 'POST'
-        req.content_type = 'application/json'
-        req.body = json.dumps(body)
-        res = req.get_response(fakes.wsgi_app())
-
     def test_delete_server_instance(self):
         req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'DELETE'
@@ -556,6 +546,18 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
+    def test_resized_server_has_correct_status(self):
+        req = self.webreq('/1', 'GET', dict(resize=dict(flavorId=3)))
+        def fake_migration_get(*args):
+            return {}
+
+        self.stubs.Set(nova.db, 'migration_get_by_instance_and_status',
+                fake_migration_get)
+        res = req.get_response(fakes.wsgi_app())
+        body = json.loads(res.body)
+        self.assertEqual(body['server']['status'], 'resize-confirm')
+        
+
     def test_confirm_resize_server(self):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
 
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 70d46a1fb..7f9706a3d 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -228,6 +228,9 @@ class FakeSessionForMigrationTests(fake.SessionBase):
     def VDI_get_by_uuid(*args):
         return 'hurr'
 
+    def VDI_resize_online(*args):
+        pass
+
     def VM_start(self, _1, ref, _2, _3):
         vm = fake.get_record('VM', ref)
         if vm['power_state'] != 'Halted':
@@ -240,7 +243,7 @@ class FakeSessionForMigrationTests(fake.SessionBase):
 
 def stub_out_migration_methods(stubs):
     def fake_get_snapshot(self, instance):
-        return 'foo', 'bar'
+        return 'vm_ref', dict(image='foo', snap='bar')
 
     @classmethod
     def fake_get_vdi(cls, session, vm_ref):
@@ -249,7 +252,7 @@ def stub_out_migration_methods(stubs):
         vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
         return vdi_ref, {'uuid': vdi_rec['uuid'], }
 
-    def fake_shutdown(self, inst, vm, method='clean'):
+    def fake_shutdown(self, inst, vm, hard=True):
         pass
 
     @classmethod
-- 
cgit 


From 8d5ffa079e768adec969a4e8ab540c24a7faaaa6 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Thu, 17 Mar 2011 20:45:18 +0000
Subject: Pep8

---
 nova/tests/api/openstack/test_servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 14b72e097..07ebfdd88 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -548,6 +548,7 @@ class ServersTest(test.TestCase):
 
     def test_resized_server_has_correct_status(self):
         req = self.webreq('/1', 'GET', dict(resize=dict(flavorId=3)))
+
         def fake_migration_get(*args):
             return {}
 
@@ -556,7 +557,6 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         body = json.loads(res.body)
         self.assertEqual(body['server']['status'], 'resize-confirm')
-        
 
     def test_confirm_resize_server(self):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
-- 
cgit 


From 2f4c1802c7e482a447d348f049ff429b3d1a640c Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Fri, 18 Mar 2011 16:06:43 -0400
Subject: fix date formatting in images controller show

---
 nova/tests/api/openstack/fakes.py       | 20 +++++++++-----
 nova/tests/api/openstack/test_images.py | 46 ++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 29 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 15f8a5b56..9573cf128 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import copy
 import datetime
 import json
 import random
@@ -151,22 +152,23 @@ def stub_out_glance(stubs, initial_fixtures=None):
                     for f in self.fixtures]
 
         def fake_get_images_detailed(self):
-            return self.fixtures
+            return copy.deepcopy(self.fixtures)
 
         def fake_get_image_meta(self, image_id):
-            for f in self.fixtures:
-                if f['id'] == image_id:
-                    return f
+            image = self._find_image(image_id)
+            if image:
+                return copy.deepcopy(image)
             raise glance_exc.NotFound
 
         def fake_add_image(self, image_meta, data=None):
+            image_meta = copy.deepcopy(image_meta)
             id = ''.join(random.choice(string.letters) for _ in range(20))
             image_meta['id'] = id
             self.fixtures.append(image_meta)
             return image_meta
 
         def fake_update_image(self, image_id, image_meta, data=None):
-            f = self.fake_get_image_meta(image_id)
+            f = self._find_image(image_id)
             if not f:
                 raise glance_exc.NotFound
 
@@ -174,7 +176,7 @@ def stub_out_glance(stubs, initial_fixtures=None):
             return f
 
         def fake_delete_image(self, image_id):
-            f = self.fake_get_image_meta(image_id)
+            f = self._find_image(image_id)
             if not f:
                 raise glance_exc.NotFound
 
@@ -183,6 +185,12 @@ def stub_out_glance(stubs, initial_fixtures=None):
         ##def fake_delete_all(self):
         ##    self.fixtures = []
 
+        def _find_image(self, image_id):
+            for f in self.fixtures:
+                if f['id'] == image_id:
+                    return f
+            return None
+
     GlanceClient = glance_client.Client
     fake = FakeGlanceClient(initial_fixtures)
 
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 47dd11e5b..b771966f1 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -21,7 +21,7 @@ and as a WSGI layer
 """
 
 import json
-import datetime
+import datetime as dt
 import shutil
 import tempfile
 
@@ -177,13 +177,13 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
     """Test of the OpenStack API /images application controller"""
 
     # Registered images at start of each test.
-
+    now = dt.datetime.utcnow()
     IMAGE_FIXTURES = [
         {'id': '23g2ogk23k4hhkk4k42l',
          'imageId': '23g2ogk23k4hhkk4k42l',
          'name': 'public image #1',
-         'created_at': datetime.datetime.utcnow().isoformat(),
-         'updated_at': datetime.datetime.utcnow().isoformat(),
+         'created_at': now.isoformat(),
+         'updated_at': now.isoformat(),
          'deleted_at': None,
          'deleted': False,
          'is_public': True,
@@ -192,8 +192,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         {'id': 'slkduhfas73kkaskgdas',
          'imageId': 'slkduhfas73kkaskgdas',
          'name': 'public image #2',
-         'created_at': datetime.datetime.utcnow().isoformat(),
-         'updated_at': datetime.datetime.utcnow().isoformat(),
+         'created_at': now.isoformat(),
+         'updated_at': now.isoformat(),
          'deleted_at': None,
          'deleted': False,
          'is_public': True,
@@ -235,20 +235,20 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
-        def _is_equivalent_subset(x, y):
-            if set(x) <= set(y):
-                for k, v in x.iteritems():
-                    if x[k] != y[k]:
-                        if x[k] == 'active' and y[k] == 'available':
-                            continue
-                        return False
-                return True
-            return False
-
-        for image in res_dict['images']:
-            for image_fixture in self.IMAGE_FIXTURES:
-                if _is_equivalent_subset(image, image_fixture):
-                    break
-            else:
-                self.assertEquals(1, 2, "image %s not in fixtures!" %
-                                                            str(image))
+        for image in self.IMAGE_FIXTURES:
+            expected = {
+                'id': abs(hash(image['imageId'])),
+                'name': image['name'],
+                'status': 'active',
+            }
+            self.assertTrue(expected in res_dict['images'])
+
+    def test_show_image(self):
+        expected = self.IMAGE_FIXTURES[0]
+        id = abs(hash(expected['id']))
+        expected_time = self.now.strftime('%Y-%m-%dT%H:%M:%SZ')
+        req = webob.Request.blank('/v1.0/images/%s' % id)
+        res = req.get_response(fakes.wsgi_app())
+        actual = json.loads(res.body)['image']
+        self.assertEqual(expected_time, actual['created_at'])
+        self.assertEqual(expected_time, actual['updated_at'])
-- 
cgit 


From 85f50cf496e2c193ddc715f3019b4a4769ab5bd9 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 21 Mar 2011 15:14:24 -0400
Subject: pep8; various fixes

---
 nova/tests/api/openstack/test_servers.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 6e78db9da..a9e76b244 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -311,10 +311,19 @@ class ServersTest(test.TestCase):
 
         imageRef = 'http://localhost/v1.1/images/2'
         flavorRef = 'http://localhost/v1.1/flavors/3'
-        body = dict(server=dict(
-            name='server_test', imageRef=imageRef, flavorRef=flavorRef,
-            metadata={'hello': 'world', 'open': 'stack'},
-            personality={}))
+        body = {
+            'server': {
+                'name': 'server_test',
+                'imageRef': imageRef,
+                'flavorRef': flavorRef,
+                'metadata': {
+                    'hello': 'world',
+                    'open': 'stack',
+                },
+                'personality': {},
+            },
+        }
+
         req = webob.Request.blank('/v1.1/servers')
         req.method = 'POST'
         req.body = json.dumps(body)
-- 
cgit 


From 27ae9700739bd6a1e6f9db90e407f450ff3e770b Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Mon, 21 Mar 2011 16:35:38 -0400
Subject: added licenses

---
 nova/tests/image/__init__.py    | 17 +++++++++++++++++
 nova/tests/image/test_glance.py | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/image/__init__.py b/nova/tests/image/__init__.py
index e69de29bb..fae25bca7 100644
--- a/nova/tests/image/__init__.py
+++ b/nova/tests/image/__init__.py
@@ -0,0 +1,17 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 6e94aa909..fcd686c84 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -1,3 +1,22 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
 import datetime as dt
 import unittest
 
-- 
cgit 


From 414c615a3ac2e61f312f8383f764114e7d782de1 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Mon, 21 Mar 2011 16:40:26 -0400
Subject: fix licenses

---
 nova/tests/image/__init__.py    | 3 +--
 nova/tests/image/test_glance.py | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/__init__.py b/nova/tests/image/__init__.py
index fae25bca7..b94e2e54e 100644
--- a/nova/tests/image/__init__.py
+++ b/nova/tests/image/__init__.py
@@ -1,7 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Openstack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index fcd686c84..d49b3dfdb 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -1,7 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Openstack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
-- 
cgit 


From 39783f386a473ed28c786bb72a29e8403503c40c Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Mon, 21 Mar 2011 17:09:53 -0400
Subject: make bcwaldon happy

---
 nova/tests/api/openstack/test_images.py | 4 ++--
 nova/tests/image/test_glance.py         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index b771966f1..a866c764d 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -21,7 +21,7 @@ and as a WSGI layer
 """
 
 import json
-import datetime as dt
+import datetime
 import shutil
 import tempfile
 
@@ -177,7 +177,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
     """Test of the OpenStack API /images application controller"""
 
     # Registered images at start of each test.
-    now = dt.datetime.utcnow()
+    now = datetime.datetime.utcnow()
     IMAGE_FIXTURES = [
         {'id': '23g2ogk23k4hhkk4k42l',
          'imageId': '23g2ogk23k4hhkk4k42l',
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index d49b3dfdb..30021dbc1 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -58,12 +58,12 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.service = glance.GlanceImageService(self.client)
 
     def test_show_passes_through_to_client(self):
-        self.client.images = {'xyz': "image"}
-        self.assertEqual(self.service.show({}, 'xyz'), "image")
+        self.client.images = {'xyz': {'foo': 'bar'}}
+        self.assertEqual(self.service.show({}, 'xyz'), {'foo': 'bar'})
 
     def test_detail_passes_through_to_client(self):
-        self.client.images = {1: "an image"}
-        self.assertEqual(list(self.service.detail({})), ["an image"])
+        self.client.images = {1: {'foo': 'bar'}}
+        self.assertEqual(list(self.service.detail({})), [{'foo': 'bar'}])
 
     def test_show_makes_create_datetimes(self):
         create_time = dt.datetime.utcnow()
-- 
cgit 


From e1b9db2ac1af8f38084f9794a430e0292f110ed6 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Mon, 21 Mar 2011 17:23:36 -0400
Subject: get rid of another datetime alias

---
 nova/tests/image/test_glance.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 30021dbc1..f1f8504f3 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 
-import datetime as dt
+import datetime
 import unittest
 
 from nova.image import glance
@@ -66,7 +66,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(list(self.service.detail({})), [{'foo': 'bar'}])
 
     def test_show_makes_create_datetimes(self):
-        create_time = dt.datetime.utcnow()
+        create_time = datetime.datetime.utcnow()
         self.client.images = {'xyz': {
             'id': "id",
             'name': "my awesome image",
@@ -76,7 +76,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(actual['created_at'], create_time)
 
     def test_show_makes_update_datetimes(self):
-        update_time = dt.datetime.utcnow()
+        update_time = datetime.datetime.utcnow()
         self.client.images = {'abc': {
             'id': "id",
             'name': "my okay image",
@@ -86,7 +86,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(actual['updated_at'], update_time)
 
     def test_show_makes_delete_datetimes(self):
-        delete_time = dt.datetime.utcnow()
+        delete_time = datetime.datetime.utcnow()
         self.client.images = {'123': {
             'id': "123",
             'name': "my lame image",
@@ -105,7 +105,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(actual['deleted_at'], None)
 
     def test_detail_handles_timestamps(self):
-        now = dt.datetime.utcnow()
+        now = datetime.datetime.utcnow()
         image1 = {
             'id': 1,
             'name': 'image 1',
@@ -126,7 +126,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(i2['deleted_at'], now)
 
     def test_get_handles_timestamps(self):
-        now = dt.datetime.utcnow()
+        now = datetime.datetime.utcnow()
         self.client.images = {'abcd': {
             'id': 'abcd',
             'name': 'nifty image',
@@ -144,7 +144,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(actual['deleted_at'], None)
 
     def test_create_handles_timestamps(self):
-        now = dt.datetime.utcnow()
+        now = datetime.datetime.utcnow()
         self.client.add_response = {
             'id': 'abcd',
             'name': 'blah',
@@ -166,7 +166,7 @@ class TestGlanceImageServiceDatetimes(unittest.TestCase):
         self.assertEqual(actual['deleted_at'], None)
 
     def test_update_handles_timestamps(self):
-        now = dt.datetime.utcnow()
+        now = datetime.datetime.utcnow()
         self.client.update_response = {
             'id': 'abcd',
             'name': 'blah',
-- 
cgit 


From d1860ce5d26fbbadb2310e8225e924879cde9a6c Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 10:35:43 +0100
Subject: Make synchronized support both external (file based) locks as well as
 internal (semaphore based) locks. Attempt to make it native thread safe at
 the expense of never cleaning up semaphores.

---
 nova/tests/test_misc.py | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index 1fbaf304f..961499a60 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -16,8 +16,12 @@
 
 import errno
 import os
+import random
 import select
 
+from eventlet import greenpool
+from eventlet import greenthread
+
 from nova import test
 from nova.utils import parse_mailmap, str_dict_replace, synchronized
 
@@ -72,11 +76,37 @@ class LockTestCase(test.TestCase):
         self.assertEquals(foo.__name__, 'foo', "Wrapped function's name "
                                                "got mangled")
 
-    def test_synchronized(self):
+    def test_synchronized_internally(self):
+        """We can lock across multiple green threads"""
+        seen_threads = list()
+        @synchronized('testlock', external=False)
+        def f(id):
+            for x in range(10):
+                seen_threads.append(id)
+                greenthread.sleep(0)
+
+        threads = []
+        pool = greenpool.GreenPool(10)
+        for i in range(10):
+            threads.append(pool.spawn(f, i))
+
+        for thread in threads:
+            thread.wait()
+
+        self.assertEquals(len(seen_threads), 100)
+        # Looking at the seen threads, split it into chunks of 10, and verify
+        # that the last 9 match the first in each chunk.
+        for i in range(10):
+            for j in range(9):
+                self.assertEquals(seen_threads[i*10], seen_threads[i*10+1+j])
+
+
+    def test_synchronized_externally(self):
+        """We can lock across multiple processes"""
         rpipe1, wpipe1 = os.pipe()
         rpipe2, wpipe2 = os.pipe()
 
-        @synchronized('testlock')
+        @synchronized('testlock', external=True)
         def f(rpipe, wpipe):
             try:
                 os.write(wpipe, "foo")
-- 
cgit 


From 60a3aa86db1d0e1ea2f680c9587881e45fa99336 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 14:14:47 +0100
Subject: Make synchronized decorator not leak semaphores, at the expense of
 not being truly thread safe (but safe enough for Eventlet style green
 threads).

---
 nova/tests/test_misc.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index 961499a60..c0c72bb12 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -16,7 +16,6 @@
 
 import errno
 import os
-import random
 import select
 
 from eventlet import greenpool
-- 
cgit 


From 62f9cc7cee30332143bf4e6e54fd21335db3c8da Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 14:36:32 +0100
Subject: Convert _cache_image to use utils.synchronized decorator. Disable its
 test case, since I think it is no longer needed with the tests for
 synchronized.

---
 nova/tests/test_virt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index b214f5ce7..b9cd30a79 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -62,7 +62,7 @@ class CacheConcurrencyTestCase(test.TestCase):
         self.stubs.Set(os.path, 'exists', fake_exists)
         self.stubs.Set(utils, 'execute', fake_execute)
 
-    def test_same_fname_concurrency(self):
+    def notest_same_fname_concurrency(self):
         """Ensures that the same fname cache runs at a sequentially"""
         conn = libvirt_conn.LibvirtConnection
         wait1 = eventlet.event.Event()
-- 
cgit 


From d2494199df440809bbfbc55868b0dd57053868ed Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 16:23:47 +0100
Subject: Remove checks in _cache_image tests that were too implementation
 specific.

---
 nova/tests/test_virt.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index b9cd30a79..6bafac39f 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -62,7 +62,7 @@ class CacheConcurrencyTestCase(test.TestCase):
         self.stubs.Set(os.path, 'exists', fake_exists)
         self.stubs.Set(utils, 'execute', fake_execute)
 
-    def notest_same_fname_concurrency(self):
+    def test_same_fname_concurrency(self):
         """Ensures that the same fname cache runs at a sequentially"""
         conn = libvirt_conn.LibvirtConnection
         wait1 = eventlet.event.Event()
@@ -77,13 +77,11 @@ class CacheConcurrencyTestCase(test.TestCase):
         eventlet.sleep(0)
         try:
             self.assertFalse(done2.ready())
-            self.assertTrue('fname' in conn._image_sems)
         finally:
             wait1.send()
         done1.wait()
         eventlet.sleep(0)
         self.assertTrue(done2.ready())
-        self.assertFalse('fname' in conn._image_sems)
 
     def test_different_fname_concurrency(self):
         """Ensures that two different fname caches are concurrent"""
-- 
cgit 


From 9aac55b650e9f39c5771d4683e51af5eac6204bb Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 16:24:03 +0100
Subject: Add a test for leaked semaphores.

---
 nova/tests/test_misc.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index c0c72bb12..8fc5d67c0 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -22,7 +22,8 @@ from eventlet import greenpool
 from eventlet import greenthread
 
 from nova import test
-from nova.utils import parse_mailmap, str_dict_replace, synchronized
+from nova import utils
+from nova.utils import parse_mailmap, str_dict_replace
 
 
 class ProjectTestCase(test.TestCase):
@@ -66,7 +67,7 @@ class ProjectTestCase(test.TestCase):
 
 class LockTestCase(test.TestCase):
     def test_synchronized_wrapped_function_metadata(self):
-        @synchronized('whatever')
+        @utils.synchronized('whatever')
         def foo():
             """Bar"""
             pass
@@ -77,8 +78,9 @@ class LockTestCase(test.TestCase):
 
     def test_synchronized_internally(self):
         """We can lock across multiple green threads"""
+        saved_sem_num = len(utils._semaphores)
         seen_threads = list()
-        @synchronized('testlock', external=False)
+        @utils.synchronized('testlock2', external=False)
         def f(id):
             for x in range(10):
                 seen_threads.append(id)
@@ -99,13 +101,15 @@ class LockTestCase(test.TestCase):
             for j in range(9):
                 self.assertEquals(seen_threads[i*10], seen_threads[i*10+1+j])
 
+        self.assertEqual(saved_sem_num, len(utils._semaphores),
+                         "Semaphore leak detected")
 
     def test_synchronized_externally(self):
         """We can lock across multiple processes"""
         rpipe1, wpipe1 = os.pipe()
         rpipe2, wpipe2 = os.pipe()
 
-        @synchronized('testlock', external=True)
+        @utils.synchronized('testlock1', external=True)
         def f(rpipe, wpipe):
             try:
                 os.write(wpipe, "foo")
-- 
cgit 


From b2bdeb82024b1a015ccb2ad14606d6e9ccf80aa8 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 16:29:37 +0100
Subject: pep8

---
 nova/tests/test_misc.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index 8fc5d67c0..4e17e1ce0 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -80,6 +80,7 @@ class LockTestCase(test.TestCase):
         """We can lock across multiple green threads"""
         saved_sem_num = len(utils._semaphores)
         seen_threads = list()
+
         @utils.synchronized('testlock2', external=False)
         def f(id):
             for x in range(10):
@@ -99,7 +100,8 @@ class LockTestCase(test.TestCase):
         # that the last 9 match the first in each chunk.
         for i in range(10):
             for j in range(9):
-                self.assertEquals(seen_threads[i*10], seen_threads[i*10+1+j])
+                self.assertEquals(seen_threads[i * 10],
+                                  seen_threads[i * 10 + 1 + j])
 
         self.assertEqual(saved_sem_num, len(utils._semaphores),
                          "Semaphore leak detected")
-- 
cgit 


From 3c7de6db490a8482f6d1fb5fefc750050cb1e269 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 16:42:37 +0100
Subject: Pass a fake timing source to
 test_ensure_filtering_rules_for_instance_timeout, shaving off 30 seconds of
 test run time.

---
 nova/tests/test_virt.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index b214f5ce7..a754f451a 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -429,6 +429,15 @@ class LibvirtConnTestCase(test.TestCase):
         def fake_raise(self):
             raise libvirt.libvirtError('ERR')
 
+        class FakeTime(object):
+            def __init__(self):
+                self.counter = 0
+
+            def sleep(self, t):
+                self.counter += t
+
+        fake_timer = FakeTime()
+
         self.create_fake_libvirt_mock(nwfilterLookupByName=fake_raise)
         instance_ref = db.instance_create(self.context, self.test_instance)
 
@@ -438,11 +447,15 @@ class LibvirtConnTestCase(test.TestCase):
             conn = libvirt_conn.LibvirtConnection(False)
             conn.firewall_driver.setattr('setup_basic_filtering', fake_none)
             conn.firewall_driver.setattr('prepare_instance_filter', fake_none)
-            conn.ensure_filtering_rules_for_instance(instance_ref)
+            conn.ensure_filtering_rules_for_instance(instance_ref,
+                                                     time=fake_timer)
         except exception.Error, e:
             c1 = (0 <= e.message.find('Timeout migrating for'))
         self.assertTrue(c1)
 
+        self.assertEqual(29, fake_timer.counter, "Didn't wait the expected "
+                                                 "amount of time")
+
         db.instance_destroy(self.context, instance_ref['id'])
 
     def test_live_migration_raises_exception(self):
-- 
cgit 


From 7ae8f5563c42d7c5dc67047dd9c42e982281d80b Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 22 Mar 2011 16:53:43 +0100
Subject: Apparantly a more common problem than first thought.

---
 nova/tests/test_compute.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 3651f4cef..0209dd9ca 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -44,6 +44,14 @@ flags.DECLARE('stub_network', 'nova.compute.manager')
 flags.DECLARE('live_migration_retry_count', 'nova.compute.manager')
 
 
+class FakeTime(object):
+    def __init__(self):
+        self.counter = 0
+
+    def sleep(self, t):
+        self.counter += t
+
+
 class ComputeTestCase(test.TestCase):
     """Test case for compute"""
     def setUp(self):
@@ -342,7 +350,7 @@ class ComputeTestCase(test.TestCase):
         self.mox.ReplayAll()
         self.assertRaises(exception.NotFound,
                           self.compute.pre_live_migration,
-                          c, instance_ref['id'])
+                          c, instance_ref['id'], time=FakeTime())
 
     def test_pre_live_migration_instance_has_volume(self):
         """Confirm setup_compute_volume is called when volume is mounted."""
@@ -395,7 +403,7 @@ class ComputeTestCase(test.TestCase):
         self.compute.driver = drivermock
 
         self.mox.ReplayAll()
-        ret = self.compute.pre_live_migration(c, i_ref['id'])
+        ret = self.compute.pre_live_migration(c, i_ref['id'], time=FakeTime())
         self.assertEqual(ret, None)
 
     def test_pre_live_migration_setup_compute_node_fail(self):
@@ -428,7 +436,7 @@ class ComputeTestCase(test.TestCase):
         self.mox.ReplayAll()
         self.assertRaises(exception.ProcessExecutionError,
                           self.compute.pre_live_migration,
-                          c, i_ref['id'])
+                          c, i_ref['id'], time=FakeTime())
 
     def test_live_migration_works_correctly_with_volume(self):
         """Confirm check_for_export to confirm volume health check."""
-- 
cgit 


From e648698bd171357228881a10d76e7853938e8feb Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 22 Mar 2011 17:00:36 +0000
Subject: Fix

---
 nova/tests/test_localization.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_localization.py b/nova/tests/test_localization.py
index 393d71038..132a308fd 100644
--- a/nova/tests/test_localization.py
+++ b/nova/tests/test_localization.py
@@ -21,9 +21,9 @@ import sys
 import unittest
 
 import nova
+from nova import test
 
-
-class LocalizationTestCase(unittest.TestCase):
+class LocalizationTestCase(test.TestCase):
     def test_multiple_positional_format_placeholders(self):
         pat = re.compile("\W_\(")
         single_pat = re.compile("\W%\W")
-- 
cgit 


From 8792383dfbd630388e6a51a76910e73203a3793f Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 22 Mar 2011 18:24:00 +0000
Subject: Tweak

---
 nova/tests/test_localization.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_localization.py b/nova/tests/test_localization.py
index 132a308fd..a25809a79 100644
--- a/nova/tests/test_localization.py
+++ b/nova/tests/test_localization.py
@@ -23,6 +23,7 @@ import unittest
 import nova
 from nova import test
 
+
 class LocalizationTestCase(test.TestCase):
     def test_multiple_positional_format_placeholders(self):
         pat = re.compile("\W_\(")
-- 
cgit 


From 98b4f0924257dcfa12e4881950472e983f08ef1d Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Wed, 23 Mar 2011 21:04:42 +0000
Subject: merge prop fixes

---
 nova/tests/test_compute.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 444be5dd8..44d04a12f 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -336,7 +336,7 @@ class ComputeTestCase(test.TestCase):
         self.compute.terminate_instance(context, instance_id)
 
     def test_resize_down_fails(self):
-        """Ensure invalid flavors raise"""
+        """Ensure resizing down raises and fails"""
         context = self.context.elevated()
         instance_id = self._create_instance()
 
@@ -349,6 +349,18 @@ class ComputeTestCase(test.TestCase):
 
         self.compute.terminate_instance(context, instance_id)
 
+    def test_resize_same_size_fails(self):
+        """Ensure invalid flavors raise"""
+        context = self.context.elevated()
+        instance_id = self._create_instance()
+
+        self.compute.run_instance(self.context, instance_id)
+
+        self.assertRaises(exception.ApiError, self.compute_api.resize,
+                context, instance_id, 1)
+
+        self.compute.terminate_instance(context, instance_id)
+
     def test_get_by_flavor_id(self):
         type = instance_types.get_by_flavor_id(1)
         self.assertEqual(type, 'm1.tiny')
-- 
cgit