From dcf5fe4d9307c0d477fb8c48df74a812244d8b97 Mon Sep 17 00:00:00 2001 From: Brian Lamar Date: Thu, 5 Jan 2012 14:31:43 -0500 Subject: Ensure tests are python 2.6 compatible. Change-Id: I1c6b7a0847586a694b5af21ed6c4a942f3aab209 --- nova/tests/api/openstack/v2/test_servers.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nova/tests/api/openstack/v2/test_servers.py b/nova/tests/api/openstack/v2/test_servers.py index 6272eb5eb..67bd446f8 100644 --- a/nova/tests/api/openstack/v2/test_servers.py +++ b/nova/tests/api/openstack/v2/test_servers.py @@ -1214,8 +1214,10 @@ class ServersControllerTest(test.TestCase): self.server_delete_called = True self.stubs.Set(nova.db, 'instance_destroy', instance_destroy_mock) - with self.assertRaises(webob.exc.HTTPConflict): - self.controller.delete(req, FAKE_UUID) + self.assertRaises(webob.exc.HTTPConflict, + self.controller.delete, + req, + FAKE_UUID) def test_delete_server_instance_while_resize(self): req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID) @@ -1231,8 +1233,10 @@ class ServersControllerTest(test.TestCase): self.server_delete_called = True self.stubs.Set(nova.db, 'instance_destroy', instance_destroy_mock) - with self.assertRaises(webob.exc.HTTPConflict): - self.controller.delete(req, FAKE_UUID) + self.assertRaises(webob.exc.HTTPConflict, + self.controller.delete, + req, + FAKE_UUID) class ServerStatusTest(test.TestCase): -- cgit