openstack/aodh
Code Issues Proposed changes

Merge "Edits assert methods"

Browse Source
This commit is contained in:
Jenkins 2014-10-20 08:51:34 +00:00 committed by Gerrit Code Review
commit 3fbed6d3c7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/tests/network/services/test_fwaas.py
View File

@ -111,9 +111,9 @@ class TestFirewallPollster(_BaseTestFWPollster):
for vpn in self.fake_get_fw_service():
if vpn['status'] == 'error':
self.assertTrue(vpn not in discovered_fws)
self.assertNotIn(vpn, discovered_fws)
else:
self.assertTrue(vpn in discovered_fws)
self.assertIn(vpn, discovered_fws)
class TestIPSecConnectionsPollster(_BaseTestFWPollster):

12
ceilometer/tests/network/services/test_lbaas.py
View File

@ -157,9 +157,9 @@ class TestLBPoolPollster(_BaseTestLBPollster):
self.assertEqual(4, len(discovered_pools))
for pool in self.fake_get_pools():
if pool['status'] == 'error':
self.assertTrue(pool not in discovered_pools)
self.assertNotIn(pool, discovered_pools)
else:
self.assertTrue(pool in discovered_pools)
self.assertIn(pool, discovered_pools)
class TestLBVipPollster(_BaseTestLBPollster):
@ -280,9 +280,9 @@ class TestLBVipPollster(_BaseTestLBPollster):
self.assertEqual(4, len(discovered_vips))
for pool in self.fake_get_vips():
if pool['status'] == 'error':
self.assertTrue(pool not in discovered_vips)
self.assertNotIn(pool, discovered_vips)
else:
self.assertTrue(pool in discovered_vips)
self.assertIn(pool, discovered_vips)
class TestLBMemberPollster(_BaseTestLBPollster):
@ -374,9 +374,9 @@ class TestLBMemberPollster(_BaseTestLBPollster):
self.assertEqual(4, len(discovered_members))
for pool in self.fake_get_members():
if pool['status'] == 'error':
self.assertTrue(pool not in discovered_members)
self.assertNotIn(pool, discovered_members)
else:
self.assertTrue(pool in discovered_members)
self.assertIn(pool, discovered_members)
class TestLBHealthProbePollster(_BaseTestLBPollster):

4
ceilometer/tests/network/services/test_vpnaas.py
View File

@ -116,9 +116,9 @@ class TestVPNServicesPollster(_BaseTestVPNPollster):
for vpn in self.fake_get_vpn_service():
if vpn['status'] == 'error':
self.assertTrue(vpn not in discovered_vpns)
self.assertNotIn(vpn, discovered_vpns)
else:
self.assertTrue(vpn in discovered_vpns)
self.assertIn(vpn, discovered_vpns)
class TestIPSecConnectionsPollster(_BaseTestVPNPollster):