summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wolf <throughnothing@gmail.com>2011-07-15 15:14:58 -0400
committerWilliam Wolf <throughnothing@gmail.com>2011-07-15 15:14:58 -0400
commit86ff6760b33671bd8bd9ddf808c7252f434d0931 (patch)
tree5a067c721d113db707a7753e7a46a34951c40f1d
parent1e16da70134537ae53d0c79214e70f0f06b14dd2 (diff)
put maxDiff in setUp
-rw-r--r--nova/tests/api/openstack/test_servers.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index f0f6c045f..c0ccb3ef2 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -227,6 +227,7 @@ class MockSetAdminPassword(object):
class ServersTest(test.TestCase):
def setUp(self):
+ self.maxDiff = None
super(ServersTest, self).setUp()
self.stubs = stubout.StubOutForTesting()
fakes.FakeAuthManager.reset_fake_data()
@@ -303,7 +304,6 @@ class ServersTest(test.TestCase):
self.assertEqual(res_dict['server']['name'], 'server1')
def test_get_server_by_id_v1_1(self):
- self.maxDiff = None
image_bookmark = "http://localhost/images/10"
flavor_ref = "http://localhost/v1.1/flavors/1"
flavor_id = "1"
@@ -393,7 +393,6 @@ class ServersTest(test.TestCase):
self.assertDictMatch(res_dict, expected_server)
def test_get_server_with_active_status_by_id_v1_1(self):
- self.maxDiff = None
image_bookmark = "http://localhost/images/10"
flavor_ref = "http://localhost/v1.1/flavors/1"
flavor_id = "1"
@@ -483,7 +482,6 @@ class ServersTest(test.TestCase):
self.assertDictMatch(res_dict, expected_server)
def test_get_server_with_id_image_ref_by_id_v1_1(self):
- self.maxDiff = None
image_ref = "10"
image_bookmark = "http://localhost/images/10"
flavor_ref = "http://localhost/v1.1/flavors/1"
@@ -2778,7 +2776,6 @@ class ServersViewBuilderV11Test(test.TestCase):
return view_builder
def test_build_server(self):
- self.maxDiff = None
expected_server = {
"server": {
"id": 1,
@@ -2801,7 +2798,6 @@ class ServersViewBuilderV11Test(test.TestCase):
self.assertDictMatch(output, expected_server)
def test_build_server_detail(self):
- self.maxDiff = None
image_bookmark = "http://localhost/images/5"
flavor_bookmark = "http://localhost/flavors/1"
expected_server = {
@@ -2902,7 +2898,6 @@ class ServersViewBuilderV11Test(test.TestCase):
self.assertDictMatch(output, expected_server)
def test_build_server_detail_with_metadata(self):
- self.maxDiff = None
metadata = []
metadata.append(InstanceMetadata(key="Open", value="Stack"))