From fac700c8e76919996b735a5a3760050bfe05e88c Mon Sep 17 00:00:00 2001 From: Shuquan Huang Date: Wed, 30 Dec 2015 22:38:25 +0800 Subject: [PATCH] Change assertTrue(isinstance()) by optimal assert Some of tests use different method of assertTrue(isinstance(A, B)) or assertEqual(type(A), B). The correct way is to use assertIsInstance(A, B) provided by testtools. Change-Id: I8e95e10fac4748b115838b6b480f1085da73f28a Closes-bug: #1268480 --- ironic_python_agent/tests/unit/extensions/test_flow.py | 8 ++++---- ironic_python_agent/tests/unit/test_agent.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ironic_python_agent/tests/unit/extensions/test_flow.py b/ironic_python_agent/tests/unit/extensions/test_flow.py index 0a5d1cc20..7e6947ae1 100644 --- a/ironic_python_agent/tests/unit/extensions/test_flow.py +++ b/ironic_python_agent/tests/unit/extensions/test_flow.py @@ -67,8 +67,8 @@ class TestFlowExtension(test_base.BaseTestCase): result = self.agent_extension.start_flow(flow=FLOW_INFO) result.join() self.assertEqual(base.AgentCommandStatus.FAILED, result.command_status) - self.assertTrue(isinstance(result.command_error, - errors.CommandExecutionError)) + self.assertIsInstance(result.command_error, + errors.CommandExecutionError) @mock.patch('time.sleep', autospec=True) def test_sleep_flow_failed_on_second_command(self, sleep_mock): @@ -76,8 +76,8 @@ class TestFlowExtension(test_base.BaseTestCase): result = self.agent_extension.start_flow(flow=FLOW_INFO[:4]) result.join() self.assertEqual(base.AgentCommandStatus.FAILED, result.command_status) - self.assertTrue(isinstance(result.command_error, - errors.CommandExecutionError)) + self.assertIsInstance(result.command_error, + errors.CommandExecutionError) self.assertEqual(2, sleep_mock.call_count) def test_validate_exts_success(self): diff --git a/ironic_python_agent/tests/unit/test_agent.py b/ironic_python_agent/tests/unit/test_agent.py index 5cd86f749..350028332 100644 --- a/ironic_python_agent/tests/unit/test_agent.py +++ b/ironic_python_agent/tests/unit/test_agent.py @@ -159,7 +159,7 @@ class TestBaseAgent(test_base.BaseTestCase): self.agent.started_at = started_at status = self.agent.get_status() - self.assertTrue(isinstance(status, agent.IronicPythonAgentStatus)) + self.assertIsInstance(status, agent.IronicPythonAgentStatus) self.assertEqual(started_at, status.started_at) self.assertEqual(pkg_resources.get_distribution('ironic-python-agent') .version, status.version)