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

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

5 files changed, 14 insertions, 18 deletions

diff --git a/tests/unit/network_services/traffic_profile/test_fixed.py b/tests/unit/network_services/traffic_profile/test_fixed.py
index eb182a2fb..911889d3c 100644
--- a/tests/unit/network_services/traffic_profile/test_fixed.py
+++ b/tests/unit/network_services/traffic_profile/test_fixed.py
@@ -119,4 +119,4 @@ class TestFixedProfile(unittest.TestCase):
         fixed_profile = FixedProfile(self.TRAFFIC_PROFILE)
         fixed_profile.params = self.TRAFFIC_PROFILE
         fixed_profile.first_run = True
-        self.assertEqual(None, fixed_profile.execute(traffic_generator))
+        self.assertIsNone(fixed_profile.execute(traffic_generator))
diff --git a/tests/unit/network_services/traffic_profile/test_http.py b/tests/unit/network_services/traffic_profile/test_http.py
index e818a0528..c102c7966 100644
--- a/tests/unit/network_services/traffic_profile/test_http.py
+++ b/tests/unit/network_services/traffic_profile/test_http.py
@@ -33,13 +33,11 @@ class TestTrafficProfileGenericHTTP(unittest.TestCase):
         traffic_profile_generic_htt_p = \
                 TrafficProfileGenericHTTP(TrafficProfile)
         traffic_generator = {}
-        self.assertEqual(None,
-                         traffic_profile_generic_htt_p.execute(
-                             traffic_generator))
+        self.assertIsNone(
+            traffic_profile_generic_htt_p.execute(traffic_generator))
 
     def test__send_http_request(self):
         traffic_profile_generic_htt_p = \
                 TrafficProfileGenericHTTP(TrafficProfile)
-        self.assertEqual(None,
-                         traffic_profile_generic_htt_p._send_http_request(
+        self.assertIsNone(traffic_profile_generic_htt_p._send_http_request(
                              "10.1.1.1", "250", "/req"))
diff --git a/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py b/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
index f83d3341d..75e41ebab 100644
--- a/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
@@ -474,7 +474,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         r_f_c2544_profile.get_multiplier = mock.Mock()
         r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
         ixia_obj = mock.MagicMock()
-        self.assertEqual(None, r_f_c2544_profile.execute_traffic(traffic_generator, ixia_obj))
+        self.assertIsNone(r_f_c2544_profile.execute_traffic(traffic_generator, ixia_obj))
 
     def test_update_traffic_profile(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
@@ -609,8 +609,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
             mock.Mock(return_value={})
         r_f_c2544_profile.full_profile = {}
         r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
-        self.assertEqual(
-            None,
+        self.assertIsNone(
             r_f_c2544_profile.start_ixia_latency(traffic_generator, ixia_obj))
 
 
diff --git a/tests/unit/network_services/traffic_profile/test_rfc2544.py b/tests/unit/network_services/traffic_profile/test_rfc2544.py
index 1749b8730..e62f19219 100644
--- a/tests/unit/network_services/traffic_profile/test_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_rfc2544.py
@@ -87,7 +87,7 @@ class TestRFC2544Profile(unittest.TestCase):
         r_f_c2544_profile = RFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
         r_f_c2544_profile.first_run = True
-        self.assertEqual(None, r_f_c2544_profile.execute_traffic(traffic_generator))
+        self.assertIsNone(r_f_c2544_profile.execute_traffic(traffic_generator))
 
     def test_get_drop_percentage(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
@@ -193,8 +193,7 @@ class TestRFC2544Profile(unittest.TestCase):
             mock.Mock(return_value=True)
         r_f_c2544_profile = RFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
-        self.assertIsNone(
-            r_f_c2544_profile.execute_traffic(traffic_generator))
+        self.assertIsNone(r_f_c2544_profile.execute_traffic(traffic_generator))
         samples = {}
         for ifname in range(1):
             name = "xe{}".format(ifname)
diff --git a/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py b/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
index c34b97531..95a962d55 100644
--- a/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
+++ b/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
@@ -153,11 +153,11 @@ class TestTrexProfile(unittest.TestCase):
 
         trex_profile = \
             TrexProfile(TrafficProfile)
-        self.assertEqual(None, trex_profile.set_qinq(qinq))
+        self.assertIsNone(trex_profile.set_qinq(qinq))
 
         qinq = {"S-VLAN": {"id": "128-130", "priority": 0, "cfi": 0},
                 "C-VLAN": {"id": "512-515", "priority": 0, "cfi": 0}}
-        self.assertEqual(None, trex_profile.set_qinq(qinq))
+        self.assertIsNone(trex_profile.set_qinq(qinq))
 
     def test__set_outer_l2_fields(self):
         trex_profile = \
@@ -166,14 +166,14 @@ class TestTrexProfile(unittest.TestCase):
                 "C-VLAN": {"id": 512, "priority": 0, "cfi": 0}}
         outer_l2 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l2']
         outer_l2['QinQ'] = qinq
-        self.assertEqual(None, trex_profile._set_outer_l2_fields(outer_l2))
+        self.assertIsNone(trex_profile._set_outer_l2_fields(outer_l2))
 
     def test__set_outer_l3v4_fields(self):
         trex_profile = \
             TrexProfile(TrafficProfile)
         outer_l3v4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l3v4']
         outer_l3v4['proto'] = 'tcp'
-        self.assertEqual(None, trex_profile._set_outer_l3v4_fields(outer_l3v4))
+        self.assertIsNone(trex_profile._set_outer_l3v4_fields(outer_l3v4))
 
     def test__set_outer_l3v6_fields(self):
         trex_profile = \
@@ -182,13 +182,13 @@ class TestTrexProfile(unittest.TestCase):
         outer_l3v6['proto'] = 'tcp'
         outer_l3v6['tc'] = 1
         outer_l3v6['hlim'] = 10
-        self.assertEqual(None, trex_profile._set_outer_l3v6_fields(outer_l3v6))
+        self.assertIsNone(trex_profile._set_outer_l3v6_fields(outer_l3v6))
 
     def test__set_outer_l4_fields(self):
         trex_profile = \
             TrexProfile(TrafficProfile)
         outer_l4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l4']
-        self.assertEqual(None, trex_profile._set_outer_l4_fields(outer_l4))
+        self.assertIsNone(trex_profile._set_outer_l4_fields(outer_l4))
 
     def test_get_streams(self):
         trex_profile = \