提交 6dc85c22 编写于 作者: L Lukáš Doktor

selftests: Avoid using deprecated "assertEquals"

The "assertEquals" is set as deprecated in py3 in favor of
"assertEqual".
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>
上级 abe11d5b
......@@ -880,7 +880,7 @@ class RunnerSimpleTestStatus(unittest.TestCase):
self.tmpdir, warn_script.path))
result = process.run(cmd_line, ignore_status=True)
json_results = json.loads(result.stdout_text)
self.assertEquals(json_results['tests'][0]['status'], 'WARN')
self.assertEqual(json_results['tests'][0]['status'], 'WARN')
warn_script.remove()
# Skip in STDOUT should be handled because of config
skip_script = script.TemporaryScript('avocado_skip.sh',
......@@ -893,7 +893,7 @@ class RunnerSimpleTestStatus(unittest.TestCase):
self.tmpdir, skip_script.path))
result = process.run(cmd_line, ignore_status=True)
json_results = json.loads(result.stdout_text)
self.assertEquals(json_results['tests'][0]['status'], 'SKIP')
self.assertEqual(json_results['tests'][0]['status'], 'SKIP')
skip_script.remove()
# STDERR skip should not be handled
skip2_script = script.TemporaryScript('avocado_skip.sh',
......@@ -906,7 +906,7 @@ class RunnerSimpleTestStatus(unittest.TestCase):
self.tmpdir, skip2_script.path))
result = process.run(cmd_line, ignore_status=True)
json_results = json.loads(result.stdout_text)
self.assertEquals(json_results['tests'][0]['status'], 'PASS')
self.assertEqual(json_results['tests'][0]['status'], 'PASS')
skip2_script.remove()
def tearDown(self):
......
......@@ -49,10 +49,10 @@ class JobTest(unittest.TestCase):
self.assertIsNone(self.job.test_suite)
self.assertIsNone(self.job.tmpdir)
self.assertFalse(self.job._Job__remove_tmpdir)
self.assertEquals(self.job.args, args)
self.assertEquals(self.job.exitcode, exit_codes.AVOCADO_ALL_OK)
self.assertEquals(self.job.references, [])
self.assertEquals(self.job.status, "RUNNING")
self.assertEqual(self.job.args, args)
self.assertEqual(self.job.exitcode, exit_codes.AVOCADO_ALL_OK)
self.assertEqual(self.job.references, [])
self.assertEqual(self.job.status, "RUNNING")
uid = self.job.unique_id
# Job with setup called
......@@ -62,8 +62,8 @@ class JobTest(unittest.TestCase):
self.assertIsNotNone(self.job.result)
self.assertIsNotNone(self.job.tmpdir)
self.assertTrue(self.job._Job__remove_tmpdir)
self.assertEquals(uid, self.job.unique_id)
self.assertEquals(self.job.status, "RUNNING")
self.assertEqual(uid, self.job.unique_id)
self.assertEqual(self.job.status, "RUNNING")
# Calling setup twice
self.assertRaises(AssertionError, self.job.setup)
......
......@@ -55,7 +55,7 @@ class TestRunnerQueue(unittest.TestCase):
'base_logdir': self.tmpdir}]
msg = self._run_test(factory)
self.assertEquals(msg['whiteboard'], 'ZGVmYXVsdCB3\n')
self.assertEqual(msg['whiteboard'], 'ZGVmYXVsdCB3\n')
def tearDown(self):
shutil.rmtree(self.tmpdir)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册