openstack/deb-senlin
Code Issues Proposed changes

Use assert(Not)Equal/Less/Greater

Browse Source 
Instead of using assertFalse(A * B) / assertTrue(A * B),
developers should use assertEqual/NotEqual/Less//Greater
The * operator: '==', '!=', '<', '>'

Change-Id: Ia39b92290e0b32ee00ecc2812a3d8aecce5fbaaa
This commit is contained in:
Béla Vancsics
2016-03-01 11:20:16 +01:00
parent fe17d3a70d
commit d3d76e1028
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
senlin/tests/unit/apicommon/test_serializers.py
View File

@@ -153,7 +153,7 @@ class JSONRequestDeserializerTest(base.SenlinTestCase):
def test_from_json_exceeds_max_json_mb(self):
cfg.CONF.set_override('max_json_body_size', 10, enforce_type=True)
body = jsonutils.dumps(['a'] * cfg.CONF.max_json_body_size)
self.assertTrue(len(body) > cfg.CONF.max_json_body_size)
self.assertGreater(len(body), cfg.CONF.max_json_body_size)
obj = serializers.JSONRequestDeserializer()
error = self.assertRaises(exception.RequestLimitExceeded,
obj.from_json,

31
senlin/tests/unit/engine/test_registry.py
View File

@@ -41,18 +41,17 @@ class PluginInfoTest(base.SenlinTestCase):
pi4 = registry.PluginInfo(self.reg, 'FOO', plugin2)
self.assertIsNotNone(pi1)
self.assertTrue(pi1 == pi2)
self.assertFalse(pi1 == pi3)
self.assertFalse(pi1 == pi4)
self.assertFalse(pi2 == pi4)
self.assertFalse(pi3 == pi4)
self.assertFalse(pi1 != pi2)
self.assertTrue(pi1 != pi3)
self.assertTrue(pi1 != pi4)
self.assertTrue(pi2 != pi4)
self.assertTrue(pi3 != pi4)
nothing = None
self.assertFalse(pi1 == nothing)
self.assertEqual(pi1, pi2)
self.assertNotEqual(pi1, pi3)
self.assertNotEqual(pi1, pi4)
self.assertNotEqual(pi2, pi4)
self.assertNotEqual(pi3, pi4)
self.assertEqual(pi1, pi2)
self.assertNotEqual(pi1, pi3)
self.assertNotEqual(pi1, pi4)
self.assertNotEqual(pi2, pi4)
self.assertNotEqual(pi3, pi4)
self.assertIsNotNone(pi1)
def test_ordering(self):
plugin1 = mock.Mock()
@@ -60,14 +59,14 @@ class PluginInfoTest(base.SenlinTestCase):
pi1 = registry.PluginInfo(self.reg, 'FOO', plugin1)
pi2 = registry.PluginInfo(self.reg, 'FOO', plugin1)
pi2.user_provided = False
self.assertTrue(pi1 < pi2)
self.assertLess(pi1, pi2)
pi3 = registry.PluginInfo(self.reg, 'FOO_LONG', plugin1)
self.assertTrue(pi3 < pi1)
self.assertLess(pi3, pi1)
pi4 = registry.PluginInfo(self.reg, 'BAR', plugin2)
self.assertTrue(pi4 < pi1)
self.assertFalse(pi4 > pi1)
self.assertLess(pi4, pi1)
self.assertNotEqual(pi4, pi1)
def test_str(self):
plugin = mock.Mock()

6
senlin/tests/unit/test_common_constraints.py
View File

@@ -282,7 +282,7 @@ class TestConstraintsSchema(testtools.TestCase):
spec.validate)
msg = _('The value "%s" cannot be converted into an '
'integer.') % data['key2']
self.assertTrue(six.text_type(ex.message).find(msg) != -1)
self.assertNotEqual(-1, six.text_type(ex.message).find(msg))
def test_policy_validate_fail_unrecognizable_key(self):
spec_schema = {
@@ -294,7 +294,7 @@ class TestConstraintsSchema(testtools.TestCase):
ex = self.assertRaises(exception.SpecValidationFailed,
spec.validate)
msg = _('Unrecognizable spec item "%s"') % 'key2'
self.assertTrue(six.text_type(ex.message).find(msg) != -1)
self.assertNotEqual(-1, six.text_type(ex.message).find(msg))
def test_policy_validate_fail_required_key_missing(self):
spec_schema = {
@@ -307,7 +307,7 @@ class TestConstraintsSchema(testtools.TestCase):
ex = self.assertRaises(exception.SpecValidationFailed,
spec.validate)
msg = _('Required spec item "%s" not assigned') % 'key2'
self.assertTrue(six.text_type(ex.message).find(msg) != -1)
self.assertNotEqual(-1, six.text_type(ex.message).find(msg))
class TestSpecVersionChecking(testtools.TestCase):