summaryrefslogtreecommitdiff
path: root/tests/test_cfg.py
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2013-10-11 11:14:49 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2013-10-23 16:19:57 +0800
commit5def5c54ed7d04295355fdc55c939190cea0fa0f (patch)
tree4093e1ee49ad411ebb5c1ec7a08ddb08dde87236 /tests/test_cfg.py
parent1a846bf7e01ef84b7e6ebc90da21a9f9f2fe400f (diff)
downloadoslo-config-5def5c54ed7d04295355fdc55c939190cea0fa0f.tar.gz
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. Change-Id: I04dfff271ddadaa0e5499d443948acd984ed998b
Diffstat (limited to 'tests/test_cfg.py')
-rw-r--r--tests/test_cfg.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/test_cfg.py b/tests/test_cfg.py
index c074a1d..0fe7b56 100644
--- a/tests/test_cfg.py
+++ b/tests/test_cfg.py
@@ -1312,13 +1312,13 @@ class ConfigFileReloadTestCase(BaseTestCase):
self.conf(['--config-file', paths[0]])
self.assertTrue(hasattr(self.conf, 'foo'))
- self.assertEquals(self.conf.foo, 'baar')
+ self.assertEqual(self.conf.foo, 'baar')
shutil.copy(paths[1], paths[0])
self.conf.reload_config_files()
self.assertTrue(hasattr(self.conf, 'foo'))
- self.assertEquals(self.conf.foo, 'baaar')
+ self.assertEqual(self.conf.foo, 'baaar')
def test_conf_files_reload_default(self):
self.conf.register_cli_opt(cfg.StrOpt('foo1'))
@@ -1340,18 +1340,18 @@ class ConfigFileReloadTestCase(BaseTestCase):
self.conf(args=[], default_config_files=paths)
self.assertTrue(hasattr(self.conf, 'foo1'))
- self.assertEquals(self.conf.foo1, 'default1')
+ self.assertEqual(self.conf.foo1, 'default1')
self.assertTrue(hasattr(self.conf, 'foo2'))
- self.assertEquals(self.conf.foo2, 'default2')
+ self.assertEqual(self.conf.foo2, 'default2')
shutil.copy(paths_change[0], paths[0])
shutil.copy(paths_change[1], paths[1])
self.conf.reload_config_files()
self.assertTrue(hasattr(self.conf, 'foo1'))
- self.assertEquals(self.conf.foo1, 'change_default1')
+ self.assertEqual(self.conf.foo1, 'change_default1')
self.assertTrue(hasattr(self.conf, 'foo2'))
- self.assertEquals(self.conf.foo2, 'change_default2')
+ self.assertEqual(self.conf.foo2, 'change_default2')
def test_conf_files_reload_file_not_found(self):
self.conf.register_cli_opt(cfg.StrOpt('foo', required=True))
@@ -1361,13 +1361,13 @@ class ConfigFileReloadTestCase(BaseTestCase):
self.conf(['--config-file', paths[0]])
self.assertTrue(hasattr(self.conf, 'foo'))
- self.assertEquals(self.conf.foo, 'baar')
+ self.assertEqual(self.conf.foo, 'baar')
os.remove(paths[0])
self.conf.reload_config_files()
self.assertTrue(hasattr(self.conf, 'foo'))
- self.assertEquals(self.conf.foo, 'baar')
+ self.assertEqual(self.conf.foo, 'baar')
def test_conf_files_reload_error(self):
self.conf.register_cli_opt(cfg.StrOpt('foo', required=True))
@@ -1383,17 +1383,17 @@ class ConfigFileReloadTestCase(BaseTestCase):
self.conf(['--config-file', paths[0]])
self.assertTrue(hasattr(self.conf, 'foo'))
- self.assertEquals(self.conf.foo, 'test1')
+ self.assertEqual(self.conf.foo, 'test1')
self.assertTrue(hasattr(self.conf, 'foo1'))
- self.assertEquals(self.conf.foo1, 'test11')
+ self.assertEqual(self.conf.foo1, 'test11')
shutil.copy(paths[1], paths[0])
self.conf.reload_config_files()
self.assertTrue(hasattr(self.conf, 'foo'))
- self.assertEquals(self.conf.foo, 'test1')
+ self.assertEqual(self.conf.foo, 'test1')
self.assertTrue(hasattr(self.conf, 'foo1'))
- self.assertEquals(self.conf.foo1, 'test11')
+ self.assertEqual(self.conf.foo1, 'test11')
class OptGroupsTestCase(BaseTestCase):