Replace assertEqual(None, *) with assertIsNone in tests
Replace assertEqual(None, *) with assertIsNone in tests to have more clear messages in case of failure. Change-Id: I1cc945f9dc3803a62054c538207d6dbd0fc342df Partial-bug: #1280522
This commit is contained in:
parent
fb8d77f1db
commit
65520eadeb
@ -32,7 +32,7 @@ class TestServerMeta(testtools.TestCase):
|
||||
def test_basic(self):
|
||||
sot = server_meta.ServerMeta()
|
||||
self.assertEqual('meta', sot.resource_key)
|
||||
self.assertEqual(None, sot.resources_key)
|
||||
self.assertIsNone(sot.resources_key)
|
||||
self.assertEqual('/servers/%(server_id)s/metadata', sot.base_path)
|
||||
self.assertEqual('compute', sot.service.service_type)
|
||||
self.assertTrue(sot.allow_create)
|
||||
|
@ -32,7 +32,7 @@ class TestServerMetadata(testtools.TestCase):
|
||||
def test_basic(self):
|
||||
sot = server_metadata.ServerMetadata()
|
||||
self.assertEqual('metadata', sot.resource_key)
|
||||
self.assertEqual(None, sot.resources_key)
|
||||
self.assertIsNone(sot.resources_key)
|
||||
self.assertEqual('/servers/%(server_id)s/metadata', sot.base_path)
|
||||
self.assertEqual('compute', sot.service.service_type)
|
||||
self.assertTrue(sot.allow_create)
|
||||
|
@ -82,7 +82,7 @@ class TestInstance(testtools.TestCase):
|
||||
sess = mock.Mock()
|
||||
sess.post = mock.Mock(return_value=response)
|
||||
|
||||
self.assertEqual(None, sot.restart(sess))
|
||||
self.assertIsNone(sot.restart(sess))
|
||||
|
||||
url = ("instances/%s/action" % IDENTIFIER)
|
||||
body = {'restart': {}}
|
||||
@ -97,7 +97,7 @@ class TestInstance(testtools.TestCase):
|
||||
sess.post = mock.Mock(return_value=response)
|
||||
flavor = 'http://flavor/flav'
|
||||
|
||||
self.assertEqual(None, sot.resize(sess, flavor))
|
||||
self.assertIsNone(sot.resize(sess, flavor))
|
||||
|
||||
url = ("instances/%s/action" % IDENTIFIER)
|
||||
body = {'resize': {'flavorRef': flavor}}
|
||||
@ -112,7 +112,7 @@ class TestInstance(testtools.TestCase):
|
||||
sess.post = mock.Mock(return_value=response)
|
||||
size = 4
|
||||
|
||||
self.assertEqual(None, sot.resize_volume(sess, size))
|
||||
self.assertIsNone(sot.resize_volume(sess, size))
|
||||
|
||||
url = ("instances/%s/action" % IDENTIFIER)
|
||||
body = {'resize': {'volume': size}}
|
||||
|
@ -30,7 +30,7 @@ class TestContainer(testtools.TestCase):
|
||||
|
||||
def test_basic(self):
|
||||
sot = container.Container()
|
||||
self.assertEqual(None, sot.resource_key)
|
||||
self.assertIsNone(sot.resource_key)
|
||||
self.assertEqual('containers', sot.resources_key)
|
||||
self.assertEqual('/containers', sot.base_path)
|
||||
self.assertEqual('key-manager', sot.service.service_type)
|
||||
|
@ -30,7 +30,7 @@ class TestOrder(testtools.TestCase):
|
||||
|
||||
def test_basic(self):
|
||||
sot = order.Order()
|
||||
self.assertEqual(None, sot.resource_key)
|
||||
self.assertIsNone(sot.resource_key)
|
||||
self.assertEqual('orders', sot.resources_key)
|
||||
self.assertEqual('/orders', sot.base_path)
|
||||
self.assertEqual('key-manager', sot.service.service_type)
|
||||
|
@ -83,5 +83,4 @@ class TestFloatingIP(testtools.TestCase):
|
||||
fake_response.json = mock.Mock(return_value=body)
|
||||
mock_get.return_value = fake_response
|
||||
|
||||
self.assertEqual(None,
|
||||
floating_ip.FloatingIP.find_available(mock_session))
|
||||
self.assertIsNone(floating_ip.FloatingIP.find_available(mock_session))
|
||||
|
@ -221,8 +221,8 @@ class HeaderTests(base.TestCase):
|
||||
args = {"vocals": val}
|
||||
sot = HeaderTests.Test({'headers': args})
|
||||
self.assertEqual(val, sot.hey)
|
||||
self.assertEqual(None, sot.ho)
|
||||
self.assertEqual(None, sot.letsgo)
|
||||
self.assertIsNone(sot.ho)
|
||||
self.assertIsNone(sot.letsgo)
|
||||
|
||||
def test_set_new(self):
|
||||
args = {"vocals": "joey", "bass": "deedee"}
|
||||
@ -1325,7 +1325,7 @@ class TestFind(base.TestCase):
|
||||
FakeResponse({FakeResource.resources_key: []})
|
||||
]
|
||||
|
||||
self.assertEqual(None, FakeResource.find(self.mock_session, self.NAME))
|
||||
self.assertIsNone(FakeResource.find(self.mock_session, self.NAME))
|
||||
|
||||
def test_no_name(self):
|
||||
self.mock_get.side_effect = [
|
||||
@ -1334,7 +1334,7 @@ class TestFind(base.TestCase):
|
||||
]
|
||||
FakeResource.name_attribute = None
|
||||
|
||||
self.assertEqual(None, FakeResource.find(self.mock_session, self.NAME))
|
||||
self.assertIsNone(FakeResource.find(self.mock_session, self.NAME))
|
||||
|
||||
def test_nada_not_ignored(self):
|
||||
self.mock_get.side_effect = [
|
||||
|
Loading…
Reference in New Issue
Block a user