starlingx/config
Code Issues Proposed changes

Fix: "asserts" issue for Python 2/3 compatible code

Browse Source 
replace unittest.assertEquals with unittest.assertEqual
since unittest.assertEquals Deprecated alias
https://docs.python.org/3.3/library/unittest.html#deprecated-aliases

remove H234,H235 flake8 ignore

Story: 2003433
Task: 28378

Change-Id: Ie9d1e40779f233a0f48f958ceb76b039f2c5b889
Signed-off-by: Sun Austin <austin.sun@intel.com>
This commit is contained in:
Sun Austin
2018-12-12 09:15:59 +08:00
parent 9d5675fdf6
commit bdba2e955e
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/sysinv/sysinv/tests/api/test_acl.py
View File

@@ -67,7 +67,7 @@ class TestACL(base.FunctionalTest):
response = self.get_json(self.node_path, response = self.get_json(self.node_path,
headers={'X-Auth-Token': utils.ADMIN_TOKEN}) headers={'X-Auth-Token': utils.ADMIN_TOKEN})
self.assertEquals(response['uuid'], self.fake_node['uuid']) self.assertEqual(response['uuid'], self.fake_node['uuid'])
def test_non_admin(self): def test_non_admin(self):
# Test skipped to prevent error message in Jenkins. Error thrown is: # Test skipped to prevent error message in Jenkins. Error thrown is:

2
sysinv/sysinv/sysinv/sysinv/tests/api/test_storage_tier.py
View File

@@ -513,7 +513,7 @@ class StorageTierIndependentTCs(base.FunctionalTest):
self.assertEqual([constants.SB_TIER_DEFAULT_NAMES[constants.SB_TIER_TYPE_CEPH], self.assertEqual([constants.SB_TIER_DEFAULT_NAMES[constants.SB_TIER_TYPE_CEPH],
'platinum'], 'platinum'],
tier_names) tier_names)
self.assertEquals(2, len(tier_list['storage_tiers'])) self.assertEqual(2, len(tier_list['storage_tiers']))
class StorageTierDependentTCs(base.FunctionalTest): class StorageTierDependentTCs(base.FunctionalTest):

2
sysinv/sysinv/sysinv/sysinv/tests/conductor/test_ceph.py
View File

@@ -128,7 +128,7 @@ class UpdateCephCluster(base.DbTestCase):
mock_fsid.assert_called() mock_fsid.assert_called()
self.assertIsNone(self.service._ceph.cluster_ceph_uuid) self.assertIsNone(self.service._ceph.cluster_ceph_uuid)
self.assertNotEquals(self.dbapi.clusters_get_all(type=constants.CINDER_BACKEND_CEPH), []) self.assertNotEqual(self.dbapi.clusters_get_all(type=constants.CINDER_BACKEND_CEPH), [])
storage_0 = self._create_storage_ihost('storage-0') storage_0 = self._create_storage_ihost('storage-0')

14
sysinv/sysinv/sysinv/sysinv/tests/db/sqlalchemy/test_migrations.py
View File

@@ -429,10 +429,10 @@ class TestWalkVersions(test_utils.BaseTestCase, WalkVersionsMixin):
versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1)
upgraded = [mock.call(None, v, with_data=True) for v in versions] upgraded = [mock.call(None, v, with_data=True) for v in versions]
self.assertEquals(self._migrate_up.call_args_list, upgraded) self.assertEqual(self._migrate_up.call_args_list, upgraded)
downgraded = [mock.call(None, v - 1) for v in reversed(versions)] downgraded = [mock.call(None, v - 1) for v in reversed(versions)]
self.assertEquals(self._migrate_down.call_args_list, downgraded) self.assertEqual(self._migrate_down.call_args_list, downgraded)
@mock.patch.object(WalkVersionsMixin, '_migrate_up') @mock.patch.object(WalkVersionsMixin, '_migrate_up')
@mock.patch.object(WalkVersionsMixin, '_migrate_down') @mock.patch.object(WalkVersionsMixin, '_migrate_down')
@@ -450,7 +450,7 @@ class TestWalkVersions(test_utils.BaseTestCase, WalkVersionsMixin):
upgraded.extend( upgraded.extend(
[mock.call(self.engine, v) for v in reversed(versions)] [mock.call(self.engine, v) for v in reversed(versions)]
) )
self.assertEquals(upgraded, self._migrate_up.call_args_list) self.assertEqual(upgraded, self._migrate_up.call_args_list)
downgraded_1 = [ downgraded_1 = [
mock.call(self.engine, v - 1, with_data=True) for v in versions mock.call(self.engine, v - 1, with_data=True) for v in versions
@@ -460,7 +460,7 @@ class TestWalkVersions(test_utils.BaseTestCase, WalkVersionsMixin):
downgraded_2.append(mock.call(self.engine, v - 1)) downgraded_2.append(mock.call(self.engine, v - 1))
downgraded_2.append(mock.call(self.engine, v - 1)) downgraded_2.append(mock.call(self.engine, v - 1))
downgraded = downgraded_1 + downgraded_2 downgraded = downgraded_1 + downgraded_2
self.assertEquals(self._migrate_down.call_args_list, downgraded) self.assertEqual(self._migrate_down.call_args_list, downgraded)
@mock.patch.object(WalkVersionsMixin, '_migrate_up') @mock.patch.object(WalkVersionsMixin, '_migrate_up')
@mock.patch.object(WalkVersionsMixin, '_migrate_down') @mock.patch.object(WalkVersionsMixin, '_migrate_down')
@@ -476,12 +476,12 @@ class TestWalkVersions(test_utils.BaseTestCase, WalkVersionsMixin):
for v in versions: for v in versions:
upgraded.append(mock.call(self.engine, v, with_data=True)) upgraded.append(mock.call(self.engine, v, with_data=True))
upgraded.append(mock.call(self.engine, v)) upgraded.append(mock.call(self.engine, v))
self.assertEquals(upgraded, self._migrate_up.call_args_list) self.assertEqual(upgraded, self._migrate_up.call_args_list)
downgraded = [ downgraded = [
mock.call(self.engine, v - 1, with_data=True) for v in versions mock.call(self.engine, v - 1, with_data=True) for v in versions
] ]
self.assertEquals(self._migrate_down.call_args_list, downgraded) self.assertEqual(self._migrate_down.call_args_list, downgraded)
@mock.patch.object(WalkVersionsMixin, '_migrate_up') @mock.patch.object(WalkVersionsMixin, '_migrate_up')
@mock.patch.object(WalkVersionsMixin, '_migrate_down') @mock.patch.object(WalkVersionsMixin, '_migrate_down')
@@ -496,7 +496,7 @@ class TestWalkVersions(test_utils.BaseTestCase, WalkVersionsMixin):
upgraded = [ upgraded = [
mock.call(self.engine, v, with_data=True) for v in versions mock.call(self.engine, v, with_data=True) for v in versions
] ]
self.assertEquals(upgraded, self._migrate_up.call_args_list) self.assertEqual(upgraded, self._migrate_up.call_args_list)
class TestMigrations(BaseMigrationTestCase, WalkVersionsMixin): class TestMigrations(BaseMigrationTestCase, WalkVersionsMixin):

16
sysinv/sysinv/sysinv/sysinv/tests/test_utils.py
View File

@@ -113,11 +113,11 @@ exit 1
fp = open(tmpfilename2, 'r') fp = open(tmpfilename2, 'r')
runs = fp.read() runs = fp.read()
fp.close() fp.close()
self.assertNotEquals(runs.strip(), 'failure', 'stdin did not ' self.assertNotEqual(runs.strip(), 'failure', 'stdin did not '
'always get passed ' 'always get passed '
'correctly') 'correctly')
runs = int(runs.strip()) runs = int(runs.strip())
self.assertEquals(runs, 10, self.assertEqual(runs, 10,
'Ran %d times instead of 10.' % (runs,)) 'Ran %d times instead of 10.' % (runs,))
finally: finally:
os.unlink(tmpfilename) os.unlink(tmpfilename)
@@ -227,7 +227,7 @@ class GenericUtilsTestCase(base.TestCase):
flo = StringIO.StringIO(data) flo = StringIO.StringIO(data)
h1 = utils.hash_file(flo) h1 = utils.hash_file(flo)
h2 = hashlib.sha1(data).hexdigest() h2 = hashlib.sha1(data).hexdigest()
self.assertEquals(h1, h2) self.assertEqual(h1, h2)
def test_is_valid_boolstr(self): def test_is_valid_boolstr(self):
self.assertTrue(utils.is_valid_boolstr('true')) self.assertTrue(utils.is_valid_boolstr('true'))
@@ -272,12 +272,12 @@ class GenericUtilsTestCase(base.TestCase):
self.assertFalse(utils.is_valid_ipv6_cidr("127.0.0.1")) self.assertFalse(utils.is_valid_ipv6_cidr("127.0.0.1"))
def test_get_shortened_ipv6(self): def test_get_shortened_ipv6(self):
self.assertEquals("abcd:ef01:2345:6789:abcd:ef01:c0a8:fefe", self.assertEqual("abcd:ef01:2345:6789:abcd:ef01:c0a8:fefe",
utils.get_shortened_ipv6( utils.get_shortened_ipv6(
"abcd:ef01:2345:6789:abcd:ef01:192.168.254.254")) "abcd:ef01:2345:6789:abcd:ef01:192.168.254.254"))
self.assertEquals("::1", utils.get_shortened_ipv6( self.assertEqual("::1", utils.get_shortened_ipv6(
"0000:0000:0000:0000:0000:0000:0000:0001")) "0000:0000:0000:0000:0000:0000:0000:0001"))
self.assertEquals("caca::caca:0:babe:201:102", self.assertEqual("caca::caca:0:babe:201:102",
utils.get_shortened_ipv6( utils.get_shortened_ipv6(
"caca:0000:0000:caca:0000:babe:0201:0102")) "caca:0000:0000:caca:0000:babe:0201:0102"))
self.assertRaises(netaddr.AddrFormatError, utils.get_shortened_ipv6, self.assertRaises(netaddr.AddrFormatError, utils.get_shortened_ipv6,
@@ -286,9 +286,9 @@ class GenericUtilsTestCase(base.TestCase):
"failure") "failure")
def test_get_shortened_ipv6_cidr(self): def test_get_shortened_ipv6_cidr(self):
self.assertEquals("2600::/64", utils.get_shortened_ipv6_cidr( self.assertEqual("2600::/64", utils.get_shortened_ipv6_cidr(
"2600:0000:0000:0000:0000:0000:0000:0000/64")) "2600:0000:0000:0000:0000:0000:0000:0000/64"))
self.assertEquals("2600::/64", utils.get_shortened_ipv6_cidr( self.assertEqual("2600::/64", utils.get_shortened_ipv6_cidr(
"2600::1/64")) "2600::1/64"))
self.assertRaises(netaddr.AddrFormatError, self.assertRaises(netaddr.AddrFormatError,
utils.get_shortened_ipv6_cidr, utils.get_shortened_ipv6_cidr,

2
sysinv/sysinv/sysinv/tox.ini
View File

@@ -73,7 +73,7 @@ commands =
# H701 Empty localization string # H701 Empty localization string
# H702 Formatting operation should be outside of localization method call # H702 Formatting operation should be outside of localization method call
# H703 Multiple positional placeholders # H703 Multiple positional placeholders
ignore = E126,E127,E128,E226,E402,E501,H101,H102,H104,H105,H232,H234,H235,H236,H237,H238,H301,H306,H401,H403,H404,H405,H501,H701,H702,H703 ignore = E126,E127,E128,E226,E402,E501,H101,H102,H104,H105,H232,H236,H237,H238,H301,H306,H401,H403,H404,H405,H501,H701,H702,H703
exclude = build,dist exclude = build,dist
[testenv:flake8] [testenv:flake8]