Replace assertEquals with assertEqual
The method assertEquals has been deprecated since python 2.7. http://docs.python.org/2/library/unittest.html#deprecated-aliases Also in Python 3, a deprecated warning is raised when using assertEquals therefore we should use assertEqual instead. This is part of blueprint assertequal Change-Id: Ie6b881f594c0b3e7015e70a12d7ac720fa765736
This commit is contained in:
parent
b6b1e42fce
commit
63140645a8
|
@ -54,28 +54,28 @@ log_name = yarr'''
|
||||||
'log_name': None,
|
'log_name': None,
|
||||||
'section1': {'foo': 'bar'},
|
'section1': {'foo': 'bar'},
|
||||||
'section2': {'log_name': 'yarr'}}
|
'section2': {'log_name': 'yarr'}}
|
||||||
self.assertEquals(result, expected)
|
self.assertEqual(result, expected)
|
||||||
conffile = conf_object_maker()
|
conffile = conf_object_maker()
|
||||||
result = utils.readconf(conffile, 'section1')
|
result = utils.readconf(conffile, 'section1')
|
||||||
expected = {'__file__': conffile, 'log_name': 'section1',
|
expected = {'__file__': conffile, 'log_name': 'section1',
|
||||||
'foo': 'bar'}
|
'foo': 'bar'}
|
||||||
self.assertEquals(result, expected)
|
self.assertEqual(result, expected)
|
||||||
conffile = conf_object_maker()
|
conffile = conf_object_maker()
|
||||||
result = utils.readconf(conffile,
|
result = utils.readconf(conffile,
|
||||||
'section2').get('log_name')
|
'section2').get('log_name')
|
||||||
expected = 'yarr'
|
expected = 'yarr'
|
||||||
self.assertEquals(result, expected)
|
self.assertEqual(result, expected)
|
||||||
conffile = conf_object_maker()
|
conffile = conf_object_maker()
|
||||||
result = utils.readconf(conffile, 'section1',
|
result = utils.readconf(conffile, 'section1',
|
||||||
log_name='foo').get('log_name')
|
log_name='foo').get('log_name')
|
||||||
expected = 'foo'
|
expected = 'foo'
|
||||||
self.assertEquals(result, expected)
|
self.assertEqual(result, expected)
|
||||||
conffile = conf_object_maker()
|
conffile = conf_object_maker()
|
||||||
result = utils.readconf(conffile, 'section1',
|
result = utils.readconf(conffile, 'section1',
|
||||||
defaults={'bar': 'baz'})
|
defaults={'bar': 'baz'})
|
||||||
expected = {'__file__': conffile, 'log_name': 'section1',
|
expected = {'__file__': conffile, 'log_name': 'section1',
|
||||||
'foo': 'bar', 'bar': 'baz'}
|
'foo': 'bar', 'bar': 'baz'}
|
||||||
self.assertEquals(result, expected)
|
self.assertEqual(result, expected)
|
||||||
self.assertRaises(SystemExit, utils.readconf, temppath, 'section3')
|
self.assertRaises(SystemExit, utils.readconf, temppath, 'section3')
|
||||||
os.unlink(temppath)
|
os.unlink(temppath)
|
||||||
self.assertRaises(SystemExit, utils.readconf, temppath)
|
self.assertRaises(SystemExit, utils.readconf, temppath)
|
||||||
|
@ -100,7 +100,7 @@ log_name = %(yarr)s'''
|
||||||
'log_name': None,
|
'log_name': None,
|
||||||
'section1': {'foo': 'bar'},
|
'section1': {'foo': 'bar'},
|
||||||
'section2': {'log_name': '%(yarr)s'}}
|
'section2': {'log_name': '%(yarr)s'}}
|
||||||
self.assertEquals(result, expected)
|
self.assertEqual(result, expected)
|
||||||
os.unlink(temppath)
|
os.unlink(temppath)
|
||||||
self.assertRaises(SystemExit, utils.readconf, temppath)
|
self.assertRaises(SystemExit, utils.readconf, temppath)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue