diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 12:45:53 -0800 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 12:45:53 -0800 |
| commit | b47cc07a7d3be1653bbcfa3215e3427e5cc796cb (patch) | |
| tree | 93a7de2758d3d8b379861200dd2129e8bf5a4c29 /nova/tests | |
| parent | b48201be9a5fa08ce21ef241052071800e5777ca (diff) | |
| parent | e77f8751dd59e5d650d047a6711c3d137947dda7 (diff) | |
| download | nova-b47cc07a7d3be1653bbcfa3215e3427e5cc796cb.tar.gz nova-b47cc07a7d3be1653bbcfa3215e3427e5cc796cb.tar.xz nova-b47cc07a7d3be1653bbcfa3215e3427e5cc796cb.zip | |
merge with trunk
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_zones.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/test_zones.py b/nova/tests/test_zones.py index 2cb070aca..7036ebe58 100644 --- a/nova/tests/test_zones.py +++ b/nova/tests/test_zones.py @@ -67,7 +67,7 @@ class ZoneManagerTestCase(test.TestCase): FakeZone(id=1, api_url='http://foo.com', username='user1', password='pass1'), ]) - + self.assertEquals(len(zm.zone_states), 0) self.mox.ReplayAll() @@ -89,7 +89,7 @@ class ZoneManagerTestCase(test.TestCase): FakeZone(id=1, api_url='http://foo.com', username='user2', password='pass2'), ]) - + self.assertEquals(len(zm.zone_states), 1) self.mox.ReplayAll() @@ -107,8 +107,8 @@ class ZoneManagerTestCase(test.TestCase): zm.zone_states[1] = zone_state self.mox.StubOutWithMock(db, 'zone_get_all') - db.zone_get_all(mox.IgnoreArg()).AndReturn([ ]) - + db.zone_get_all(mox.IgnoreArg()).AndReturn([]) + self.assertEquals(len(zm.zone_states), 1) self.mox.ReplayAll() @@ -125,7 +125,7 @@ class ZoneManagerTestCase(test.TestCase): zm.zone_states[1] = zone_state self.mox.StubOutWithMock(db, 'zone_get_all') - + db.zone_get_all(mox.IgnoreArg()).AndReturn([ FakeZone(id=2, api_url='http://foo.com', username='user2', password='pass2'), |