Replace assertEqual(None, xx) with assertIsNone(xx)

Change-Id: Ie956d8064a8fbcbd3d56c5a79c4c613d35184af4
JIRA: YARDSTICK-942
Signed-off-by: Emma Foley <emma.l.foley@intel.com>

6 files changed, 9 insertions, 9 deletions

diff --git a/yardstick/tests/unit/benchmark/contexts/test_node.py b/yardstick/tests/unit/benchmark/contexts/test_node.py
index ae7c5d999..9761f6d53 100644
--- a/yardstick/tests/unit/benchmark/contexts/test_node.py
+++ b/yardstick/tests/unit/benchmark/contexts/test_node.py
@@ -121,7 +121,7 @@ class NodeContextTestCase(unittest.TestCase):
 
     @mock.patch("{}.AnsibleCommon".format(PREFIX))
     def test__do_ansible_job(self, *args):
-        self.assertEqual(None, self.test_context._do_ansible_job('dummy'))
+        self.assertIsNone(self.test_context._do_ansible_job('dummy'))
 
     def test_init(self):
         self.test_context.init(self.attrs)
diff --git a/yardstick/tests/unit/benchmark/core/test_task.py b/yardstick/tests/unit/benchmark/core/test_task.py
index b3a51209a..82a90b172 100644
--- a/yardstick/tests/unit/benchmark/core/test_task.py
+++ b/yardstick/tests/unit/benchmark/core/test_task.py
@@ -66,7 +66,7 @@ class TaskTestCase(unittest.TestCase):
 
         mock_dispatcher.get = mock.MagicMock(return_value=[dispatcher1,
                                                            dispatcher2])
-        self.assertEqual(None, t._do_output(output_config, {}))
+        self.assertIsNone(t._do_output(output_config, {}))
 
     @mock.patch.object(task, 'Context')
     def test_parse_networks_from_nodes(self, mock_context):
diff --git a/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index c7a29f27e..ec22d6147 100644
--- a/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -565,7 +565,7 @@ class TestNetworkServiceTestCase(unittest.TestCase):
             self.s.load_vnf_models = mock.Mock(return_value=self.s.vnfs)
             self.s._fill_traffic_profile = \
                 mock.Mock(return_value=TRAFFIC_PROFILE)
-            self.assertEqual(None, self.s.setup())
+            self.assertIsNone(self.s.setup())
 
     def test_setup_exception(self):
         with mock.patch("yardstick.ssh.SSH") as ssh:
diff --git a/yardstick/tests/unit/common/test_ansible_common.py b/yardstick/tests/unit/common/test_ansible_common.py
index 07befa66b..b01195fcc 100644
--- a/yardstick/tests/unit/common/test_ansible_common.py
+++ b/yardstick/tests/unit/common/test_ansible_common.py
@@ -99,7 +99,7 @@ class AnsibleNodeTestCase(unittest.TestCase):
 
     def test_ansible_node_getattr(self):
         a = ansible_common.AnsibleNode({"name": "name"})
-        self.assertEqual(getattr(a, "nosuch", None), None)
+        self.assertIsNone(getattr(a, "nosuch", None))
 
 
 class AnsibleNodeDictTestCase(unittest.TestCase):
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py
index 8a2f5f95b..4863f05c0 100644
--- a/yardstick/tests/unit/common/test_openstack_utils.py
+++ b/yardstick/tests/unit/common/test_openstack_utils.py
@@ -54,7 +54,7 @@ class GetNetworkIdTestCase(unittest.TestCase):
 
         output = openstack_utils.get_network_id(mock_shade_client,
                                                 'network_name')
-        self.assertEqual(None, output)
+        self.assertIsNone(output)
 
 
 class DeleteNeutronNetTestCase(unittest.TestCase):
diff --git a/yardstick/tests/unit/test_cmd/test_NSBperf.py b/yardstick/tests/unit/test_cmd/test_NSBperf.py
index 483e82a13..1366c3c00 100644
--- a/yardstick/tests/unit/test_cmd/test_NSBperf.py
+++ b/yardstick/tests/unit/test_cmd/test_NSBperf.py
@@ -91,17 +91,17 @@ class TestYardstickNSCli(unittest.TestCase):
         subprocess.check_output = mock.Mock(return_value=0)
         args = {"vnf": "vpe",
                 "test": "tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml"}
-        self.assertEqual(None, yardstick_ns_cli.run_test(args, test_path))
+        self.assertIsNone(yardstick_ns_cli.run_test(args, test_path))
         os.chdir(cur_dir)
         args = {"vnf": "vpe1"}
-        self.assertEqual(None, yardstick_ns_cli.run_test(args, test_path))
+        self.assertIsNone(yardstick_ns_cli.run_test(args, test_path))
         os.chdir(cur_dir)
         args = {"vnf": "vpe",
                 "test": "tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml."}
-        self.assertEqual(None, yardstick_ns_cli.run_test(args, test_path))
+        self.assertIsNone(yardstick_ns_cli.run_test(args, test_path))
         os.chdir(cur_dir)
         args = []
-        self.assertEqual(None, yardstick_ns_cli.run_test(args, test_path))
+        self.assertIsNone(yardstick_ns_cli.run_test(args, test_path))
         os.chdir(cur_dir)
 
     def test_terminate_if_less_options(self):