diff options
| author | Sergey Nikitin <snikitin@mirantis.com> | 2014-11-26 10:56:24 +0300 |
|---|---|---|
| committer | Sergey Nikitin <snikitin@mirantis.com> | 2015-01-07 12:25:53 +0300 |
| commit | b6d30549c67e113a72302164af71966a9ebace22 (patch) | |
| tree | 2759320ad75186f39a72c032976597225fd5f777 /nova/tests/unit/compute/test_compute_utils.py | |
| parent | e66a3b36a0daced6a1c3ecf5ab0f24a2662f21d1 (diff) | |
| download | nova-b6d30549c67e113a72302164af71966a9ebace22.tar.gz | |
Added hacking rule for assertTrue/False(A in B)
The following replacements were done in tests to have
clearer messages in case of failure:
- assertTrue(a in b) with assertIn(a, b)
- assertTrue(a not in b) with assertNotIn(a, b)
- assertFalse(a in b) with assertNotIn(a, b)
The error message would now be like:
'abc' not in ['a', 'b', 'c']
rather than:
'False is not True'.
Change-Id: I92d039731f17b731d302c35fb619300078b8a638
Diffstat (limited to 'nova/tests/unit/compute/test_compute_utils.py')
| -rw-r--r-- | nova/tests/unit/compute/test_compute_utils.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/nova/tests/unit/compute/test_compute_utils.py b/nova/tests/unit/compute/test_compute_utils.py index 805b3e360b..c53254d635 100644 --- a/nova/tests/unit/compute/test_compute_utils.py +++ b/nova/tests/unit/compute/test_compute_utils.py @@ -487,8 +487,8 @@ class UsageInfoTestCase(test.TestCase): 'state', 'state_description', 'bandwidth', 'audit_period_beginning', 'audit_period_ending', 'image_meta'): - self.assertTrue(attr in payload, - msg="Key %s not in payload" % attr) + self.assertIn(attr, payload, + "Key %s not in payload" % attr) self.assertEqual(payload['image_meta'], {'md_key1': 'val1', 'md_key2': 'val2'}) image_ref_url = "%s/images/1" % glance.generate_glance_url() @@ -528,8 +528,7 @@ class UsageInfoTestCase(test.TestCase): 'state', 'state_description', 'bandwidth', 'audit_period_beginning', 'audit_period_ending', 'image_meta'): - self.assertTrue(attr in payload, - msg="Key %s not in payload" % attr) + self.assertIn(attr, payload, "Key %s not in payload" % attr) self.assertEqual(payload['image_meta'], {'md_key1': 'val1', 'md_key2': 'val2'}) image_ref_url = "%s/images/1" % glance.generate_glance_url() @@ -559,8 +558,7 @@ class UsageInfoTestCase(test.TestCase): 'state', 'state_description', 'bandwidth', 'audit_period_beginning', 'audit_period_ending', 'image_meta'): - self.assertTrue(attr in payload, - msg="Key %s not in payload" % attr) + self.assertIn(attr, payload, "Key %s not in payload" % attr) self.assertEqual(payload['image_meta'], {}) image_ref_url = "%s/images/1" % glance.generate_glance_url() self.assertEqual(payload['image_ref_url'], image_ref_url) @@ -595,8 +593,7 @@ class UsageInfoTestCase(test.TestCase): self.assertEqual(str(payload['instance_flavor_id']), str(flavor_id)) for attr in ('display_name', 'created_at', 'launched_at', 'state', 'state_description', 'image_meta'): - self.assertTrue(attr in payload, - msg="Key %s not in payload" % attr) + self.assertIn(attr, payload, "Key %s not in payload" % attr) self.assertEqual(payload['image_meta'], {'md_key1': 'val1', 'md_key2': 'val2'}) self.assertEqual(payload['image_name'], 'fake_name') |