summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-09-15 13:42:30 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-09-15 13:42:30 -0700
commit2fd55ddfdf065a8792fdd0e3f3e97b5e56e4a4a3 (patch)
tree70594f287e98d8f20f923836efb066fec751aaa0 /nova/tests
parent97f28ec95ce1c6a1d3cb9c896b4ac2b4b51589e2 (diff)
tests working again
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/scheduler/test_scheduler.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index 3acb91f72..0b51792a0 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -1076,8 +1076,8 @@ class ZoneRedirectTest(test.TestCase):
def test_unmarshal_single_server(self):
decorator = api.reroute_compute("foo")
decorator.item_uuid = 'fake_uuid'
- self.assertTrue(isinstance(decorator.unmarshall_result([]),
- exception.InstanceNotFound))
+ result = decorator.unmarshall_result([])
+ self.assertEquals(decorator.unmarshall_result([]), None)
self.assertEquals(decorator.unmarshall_result(
[FakeResource(dict(a=1, b=2)), ]),
dict(server=dict(a=1, b=2)))
@@ -1182,7 +1182,7 @@ class ZoneRedirectTest(test.TestCase):
do_get(None, FakeContext(), FAKE_UUID)
self.fail("Expected redirect exception")
except api.RedirectResult, e:
- self.assertTrue(isinstance(e.results, exception.InstanceNotFound))
+ self.assertEquals(e.results, None)
class FakeServerCollection(object):