x
/
giftwrap
Code Issues Proposed changes

TrivialFix: Using assertEqual instead of assertEquals 

Following OpenStack Style Guidelines[1]: http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises
[H234] assertEquals() logs a DeprecationWarning in Python 3.x,
use assertEqual() instead. The same goes for assertNotEquals().

Change-Id: I0469bc4d5672d2832b61ec8e3cd283ad06bf380f
This commit is contained in:
Nam Nguyen Hoai 2016-09-28 15:09:33 +07:00
parent e0853bb40d
commit f2befc4168
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
giftwrap/tests/test_log.py
View File

@ -32,7 +32,7 @@ class TestLog(unittest.TestCase):
logger.info('test-info')
lc.end()
self.assertEquals("giftwrap: INFO: test-info", lc.handler.buffer[0])
self.assertEqual("giftwrap: INFO: test-info", lc.handler.buffer[0])
def test_get_logger_debug(self):
lc = LogCapture()
@ -43,5 +43,5 @@ class TestLog(unittest.TestCase):
logger.debug('test-debug')
lc.end()
self.assertEquals("giftwrap: INFO: test-info", lc.handler.buffer[0])
self.assertEquals("giftwrap: DEBUG: test-debug", lc.handler.buffer[1])
self.assertEqual("giftwrap: INFO: test-info", lc.handler.buffer[0])
self.assertEqual("giftwrap: DEBUG: test-debug", lc.handler.buffer[1])

2
giftwrap/tests/test_repo.py
View File

@ -44,6 +44,6 @@ class TestRepo(unittest.TestCase):
repo.clone(outdir)
self.assertTrue(repo.cloned)
self.assertTrue(isinstance(repo.head, OpenstackCommit))
self.assertEquals(['HEAD', 'master'], repo.branches)
self.assertEqual(['HEAD', 'master'], repo.branches)
finally:
shutil.rmtree(outdir)

10
giftwrap/tests/test_settings.py
View File

@ -33,16 +33,16 @@ class TestSettings(unittest.TestCase):
settings_dict = SAMPLE_SETTINGS
s = settings.Settings.factory(settings_dict)
self.assertEquals('my-package-name', s.package_name_format)
self.assertEquals('1.2', s.version)
self.assertEquals('/basepath', s.base_path)
self.assertEquals('http://example.txt', s.constraints[0])
self.assertEqual('my-package-name', s.package_name_format)
self.assertEqual('1.2', s.version)
self.assertEqual('/basepath', s.base_path)
self.assertEqual('http://example.txt', s.constraints[0])
def test_factory_has_default_base_path(self):
settings_dict = {'version': 'version'}
s = settings.Settings.factory(settings_dict)
self.assertEquals('/opt/openstack', s.base_path)
self.assertEqual('/opt/openstack', s.base_path)
def test_factory_raises_when_version_missing(self):
settings_dict = SAMPLE_SETTINGS

4
giftwrap/tests/test_util.py
View File

@ -25,7 +25,7 @@ class TestUtil(unittest.TestCase):
def test_execute_returns_stdout(self):
cmd = 'echo stdout'
out = util.execute(cmd)
self.assertEquals(b'stdout\n', out)
self.assertEqual(b'stdout\n', out)
def test_execute_raises_exception_on_error(self):
cmd = 'echo stderr >&2 && false'
@ -35,4 +35,4 @@ class TestUtil(unittest.TestCase):
def test_nonzero_exit_code(self):
cmd = 'echo stdout && false'
out = util.execute(cmd, exit=1)
self.assertEquals(b'stdout\n', out)
self.assertEqual(b'stdout\n', out)