From 6df07c6c7fc8c1cfc9acdd4643a737c7622dd52c Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Thu, 20 Jun 2019 13:23:53 +0900 Subject: [PATCH] Fix assertion methods Fix typos of assertion methods and misuse of assertTrue. Change-Id: Ifb7f7af5823bd14e45b0a32047e2093e49a89dbb --- tests/unit/cli/commands/test_verify.py | 4 ++-- tests/unit/env/test_env_mgr.py | 4 ++-- tests/unit/test_api.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/unit/cli/commands/test_verify.py b/tests/unit/cli/commands/test_verify.py index bd634c0fbb..db38da5298 100644 --- a/tests/unit/cli/commands/test_verify.py +++ b/tests/unit/cli/commands/test_verify.py @@ -178,7 +178,7 @@ class VerifyCommandsTestCase(test.TestCase): "formatters"] self.verify.list_verifiers(self.fake_api) # astarove: should be replaced on mock_print_list.assert_called_once() - self.assertTrue(1, len(mock_print_list.call_args())) + self.assertEqual(1, mock_print_list.call_count) self.assertEqual(([self.verifier_data], additional_fields), mock_print_list.call_args[0]) self.assertEqual(additional_keys.sort(), @@ -669,7 +669,7 @@ class VerifyCommandsTestCase(test.TestCase): additional_keys = ["normalize_field_names", "sortby_index", "formatters"] # astarove: Should be replaced on mock_print_list.assert_called_once()) - self.assertTrue(1, len(mock_print_list.call_args())) + self.assertEqual(1, mock_print_list.call_count) self.assertEqual(([self.verification_data], additional_fields), mock_print_list.call_args[0]) self.assertEqual(additional_keys.sort(), diff --git a/tests/unit/env/test_env_mgr.py b/tests/unit/env/test_env_mgr.py index 0503968c13..2c652e7f9b 100644 --- a/tests/unit/env/test_env_mgr.py +++ b/tests/unit/env/test_env_mgr.py @@ -436,9 +436,9 @@ class EnvManagerTestCase(test.TestCase): def test_rename(self, mock_env_rename): env = env_mgr.EnvManager({"uuid": "11", "name": "n"}) - self.assertTrue(env.rename, env.rename("n")) + self.assertTrue(env.rename("n")) self.assertEqual(0, mock_env_rename.call_count) - self.assertTrue(env.rename, env.rename("n2")) + self.assertTrue(env.rename("n2")) mock_env_rename.assert_called_once_with("11", "n", "n2") @mock.patch("rally.common.db.env_update") diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py index f040b9e0cb..c70e7d38ae 100644 --- a/tests/unit/test_api.py +++ b/tests/unit/test_api.py @@ -1380,12 +1380,12 @@ class VerifierAPITestCase(test.TestCase): verifier_obj.update_properties.assert_called_once_with( status=verifier_obj.status, system_wide=True) + verifier_obj.update_status.reset_mock() # check switching from system-wide to system-wide verifier_obj.system_wide = True - expected_calls = len(verifier_obj.update_status.call_args()) self.verifier_inst.update(verifier_id=uuid, system_wide=True) - self.assertTrue(expected_calls, - len(verifier_obj.update_status.call_args())) + verifier_obj.update_status.assert_called_once_with( + consts.VerifierStatus.UPDATING) self.assertFalse(verifier_obj.manager.install_venv.called) @mock.patch("rally.api._Verifier._get")