replace deprecated assertion methods

Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>

examples/tests/gdbtest.py

@@ -329,7 +329,7 @@ class GdbTest(Test):
         """
         self.log.info('Testing GDB interactivity with arguments')
         result = process.run("%s 0" % self.return99_binary_path)
-        self.assertEquals(result.exit_status, 0)
+        self.assertEqual(result.exit_status, 0)
 
     def test_exit_status(self):
         """
@@ -343,7 +343,7 @@ class GdbTest(Test):
             self.log.info('Expecting exit status "%s"', exp)
             cmd = "%s %s" % (self.return99_binary_path, arg)
             result = process.run(cmd, ignore_status=True)
-            self.assertEquals(result.exit_status, exp)
+            self.assertEqual(result.exit_status, exp)
 
     def test_server_stderr(self):
         self.log.info('Testing server stderr collection')

selftests/functional/test_argument_parsing.py

@@ -63,7 +63,7 @@ class ArgumentParsingErrorEarlyTest(unittest.TestCase):
         self.assertEqual(result.exit_status, expected_rc,
                          'Avocado did not return rc %d:\n%s' % (expected_rc, result))
         path_job_glob = os.path.join(log_dir, "job-*-%s" % job[0:7])
-        self.assertEquals(glob.glob(path_job_glob), [])
+        self.assertEqual(glob.glob(path_job_glob), [])
 
     def test_whacky_option(self):
         self.run_but_fail_before_create_job_dir('--whacky-option passtest',

selftests/functional/test_basic.py

@@ -990,12 +990,12 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase):
         stdout_lines = result.stdout.splitlines()
         self.assertIn("Tag(s)", stdout_lines[0])
         full_test_name = "%s:MyTest.test" % test
-        self.assertEquals("INSTRUMENTED %s BIG_TAG_NAME" % full_test_name,
-                          stdout_lines[1])
+        self.assertEqual("INSTRUMENTED %s BIG_TAG_NAME" % full_test_name,
+                         stdout_lines[1])
         self.assertIn("TEST TYPES SUMMARY", stdout_lines)
         self.assertIn("INSTRUMENTED: 1", stdout_lines)
         self.assertIn("TEST TAGS SUMMARY", stdout_lines)
-        self.assertEquals("BIG_TAG_NAME: 1", stdout_lines[-1])
+        self.assertEqual("BIG_TAG_NAME: 1", stdout_lines[-1])
 
     def test_plugin_list(self):
         os.chdir(basedir)

selftests/functional/test_loader.py

@@ -173,7 +173,7 @@ class LoaderTestFunctional(unittest.TestCase):
                 os.killpg(os.getpgid(test_process.pid), signal.SIGKILL)
                 self.fail("Failed to run test under %s seconds" % timeout)
             time.sleep(0.05)
-        self.assertEquals(test_process.returncode, exit_codes.AVOCADO_TESTS_FAIL)
+        self.assertEqual(test_process.returncode, exit_codes.AVOCADO_TESTS_FAIL)
 
     def test_simple(self):
         self._test('simpletest.sh', SIMPLE_TEST, 'SIMPLE', self.MODE_0775)

selftests/functional/test_skiptests.py

@@ -118,7 +118,7 @@ class TestSkipDecorators(unittest.TestCase):
         debuglog = json_results['debuglog']
 
         self.assertEqual(result.exit_status, exit_codes.AVOCADO_ALL_OK)
-        self.assertEquals(json_results['skip'], 3)
+        self.assertEqual(json_results['skip'], 3)
         self.assertFalse('setup executed' in open(debuglog, 'r').read())
         self.assertFalse('test executed' in open(debuglog, 'r').read())
         self.assertFalse('teardown executed' in open(debuglog, 'r').read())
@@ -135,7 +135,7 @@ class TestSkipDecorators(unittest.TestCase):
         result = process.run(' '.join(cmd_line), ignore_status=True)
         json_results = json.loads(result.stdout)
         self.assertEqual(result.exit_status, exit_codes.AVOCADO_ALL_OK)
-        self.assertEquals(json_results['skip'], 1)
+        self.assertEqual(json_results['skip'], 1)
 
     def test_skip_teardown(self):
         os.chdir(basedir)
@@ -149,7 +149,7 @@ class TestSkipDecorators(unittest.TestCase):
         result = process.run(' '.join(cmd_line), ignore_status=True)
         json_results = json.loads(result.stdout)
         self.assertEqual(result.exit_status, exit_codes.AVOCADO_TESTS_FAIL)
-        self.assertEquals(json_results['errors'], 1)
+        self.assertEqual(json_results['errors'], 1)
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)

selftests/unit/test_restclient_response.py

@@ -23,7 +23,7 @@ class ResultResponseTest(unittest.TestCase):
 
     def test_good_data(self):
         r = response.ResultResponse(self.GOOD_DATA)
-        self.assertEquals(r.count, 1)
+        self.assertEqual(r.count, 1)
 
     def test_bad_data_json(self):
         self.assertRaises(response.InvalidJSONError,