From afe2b6fa12a631eb7912e93806e5f1ac0f4efc0b Mon Sep 17 00:00:00 2001 From: xxj Date: Tue, 1 Nov 2016 20:21:23 +0800 Subject: [PATCH] Replace assertEqual(None, *) with assertIsNone Replace assertEqual(None, *) with assertIsNone in tests to have more clear messages in case of failure. Closes-Bug:#1280522 Change-Id: Ib7a24bf7443d9c49e42119c649a32a1e8bd20ba1 --- zun/tests/unit/api/controllers/test_types.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zun/tests/unit/api/controllers/test_types.py b/zun/tests/unit/api/controllers/test_types.py index 5e818e632..de5685ca5 100644 --- a/zun/tests/unit/api/controllers/test_types.py +++ b/zun/tests/unit/api/controllers/test_types.py @@ -19,14 +19,14 @@ from zun.tests import base as test_base class TestTypes(test_base.BaseTestCase): def test_text(self): - self.assertEqual(None, types.Text.validate(None)) + self.assertIsNone(types.Text.validate(None)) self.assertEqual('test_value', types.Text.validate('test_value')) self.assertRaises(exception.InvalidValue, types.Text.validate, 1) def test_string_type(self): - self.assertEqual(None, types.String.validate(None)) + self.assertIsNone(types.String.validate(None)) test_value = 'test_value' self.assertEqual(test_value, types.String.validate(test_value)) @@ -52,7 +52,7 @@ class TestTypes(test_base.BaseTestCase): test_value, max_length=i)) def test_integer_type(self): - self.assertEqual(None, types.Integer.validate(None)) + self.assertIsNone(types.Integer.validate(None)) test_value = 10 self.assertEqual(test_value, types.Integer.validate(test_value)) @@ -81,7 +81,7 @@ class TestTypes(test_base.BaseTestCase): test_value, maximum=i)) def test_port_type(self): - self.assertEqual(None, types.Integer.validate(None)) + self.assertIsNone(types.Integer.validate(None)) self.assertEqual(1, types.Port.validate('1')) self.assertEqual(80, types.Port.validate('80')) @@ -94,7 +94,7 @@ class TestTypes(test_base.BaseTestCase): types.Port.validate, '65536') def test_float_type(self): - self.assertEqual(None, types.Float.validate(None)) + self.assertIsNone(types.Float.validate(None)) self.assertEqual(0.5, types.Float.validate('0.5')) self.assertEqual(1.0, types.Float.validate('1')) @@ -128,7 +128,7 @@ class TestTypes(test_base.BaseTestCase): } test_type = types.Custom(TestAPI) - self.assertEqual(None, test_type.validate(None)) + self.assertIsNone(test_type.validate(None)) value = TestAPI(test='test_value') value = test_type.validate(value) @@ -146,7 +146,7 @@ class TestTypes(test_base.BaseTestCase): def test_list_with_text_type(self): list_type = types.List(types.Text) - self.assertEqual(None, list_type.validate(None)) + self.assertIsNone(list_type.validate(None)) value = list_type.validate(['test1', 'test2']) self.assertEqual(['test1', 'test2'], value) @@ -164,7 +164,7 @@ class TestTypes(test_base.BaseTestCase): } list_type = types.List(types.Custom(TestAPI)) - self.assertEqual(None, list_type.validate(None)) + self.assertIsNone(list_type.validate(None)) value = [{'test': 'test_value'}] value = list_type.validate(value)