Merge "Replace assertEqual(None, *) with assertIsNone in tests"
This commit is contained in:
commit
010c6482e2
|
@ -823,8 +823,7 @@ class TestCfnHelper(testtools.TestCase):
|
||||||
|
|
||||||
def test_metadata_server_nofile(self):
|
def test_metadata_server_nofile(self):
|
||||||
random_filename = self.getUniqueString()
|
random_filename = self.getUniqueString()
|
||||||
self.assertEqual(None,
|
self.assertIsNone(cfn_helper.metadata_server_port(random_filename))
|
||||||
cfn_helper.metadata_server_port(random_filename))
|
|
||||||
|
|
||||||
def test_to_boolean(self):
|
def test_to_boolean(self):
|
||||||
self.assertTrue(cfn_helper.to_boolean(True))
|
self.assertTrue(cfn_helper.to_boolean(True))
|
||||||
|
@ -1171,7 +1170,7 @@ class TestMetadataRetrieve(testtools.TestCase):
|
||||||
mock_popen.side_effect = write_cache_file
|
mock_popen.side_effect = write_cache_file
|
||||||
md = cfn_helper.Metadata('teststack', None)
|
md = cfn_helper.Metadata('teststack', None)
|
||||||
meta_out = md.get_nova_meta(cache_path=cache_path)
|
meta_out = md.get_nova_meta(cache_path=cache_path)
|
||||||
self.assertEqual(None, meta_out)
|
self.assertIsNone(meta_out)
|
||||||
mock_popen.assert_has_calls(
|
mock_popen.assert_has_calls(
|
||||||
popen_root_calls([['curl', '-o', cache_path, url]]))
|
popen_root_calls([['curl', '-o', cache_path, url]]))
|
||||||
|
|
||||||
|
@ -1190,7 +1189,7 @@ class TestMetadataRetrieve(testtools.TestCase):
|
||||||
mock_popen.return_value = FakePOpen('Failed', '', 1)
|
mock_popen.return_value = FakePOpen('Failed', '', 1)
|
||||||
md = cfn_helper.Metadata('teststack', None)
|
md = cfn_helper.Metadata('teststack', None)
|
||||||
meta_out = md.get_nova_meta(cache_path=cache_path)
|
meta_out = md.get_nova_meta(cache_path=cache_path)
|
||||||
self.assertEqual(None, meta_out)
|
self.assertIsNone(meta_out)
|
||||||
mock_popen.assert_has_calls(
|
mock_popen.assert_has_calls(
|
||||||
popen_root_calls([['curl', '-o', cache_path, url]]))
|
popen_root_calls([['curl', '-o', cache_path, url]]))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue