Merge "Replace assertEqual(x, True|False) with assert[True|False](x)"

9 files changed, 28 insertions, 28 deletions

diff --git a/tests/unit/benchmark/scenarios/networking/test_netperf.py b/tests/unit/benchmark/scenarios/networking/test_netperf.py
index d0f862fb5..d82a00931 100755
--- a/tests/unit/benchmark/scenarios/networking/test_netperf.py
+++ b/tests/unit/benchmark/scenarios/networking/test_netperf.py
@@ -48,7 +48,7 @@ class NetperfTestCase(unittest.TestCase):
         p.setup()
         self.assertIsNotNone(p.server)
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_netperf_successful_no_sla(self, mock_ssh):
 
diff --git a/tests/unit/benchmark/scenarios/networking/test_netperf_node.py b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
index 62874cc44..8be9bb94d 100755
--- a/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
+++ b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
@@ -48,7 +48,7 @@ class NetperfNodeTestCase(unittest.TestCase):
         p.setup()
         self.assertIsNotNone(p.server)
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_netperf_node_successful_no_sla(self, mock_ssh):
 
diff --git a/tests/unit/benchmark/scenarios/networking/test_nstat.py b/tests/unit/benchmark/scenarios/networking/test_nstat.py
index 84b559812..4b58e06c1 100644
--- a/tests/unit/benchmark/scenarios/networking/test_nstat.py
+++ b/tests/unit/benchmark/scenarios/networking/test_nstat.py
@@ -39,7 +39,7 @@ class NstatTestCase(unittest.TestCase):
 
         mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         self.assertIsNotNone(n.client)
-        self.assertEqual(n.setup_done, True)
+        self.assertTrue(n.setup_done)
 
     def test_nstat_successful_no_sla(self, mock_ssh):
 
diff --git a/tests/unit/benchmark/scenarios/networking/test_ping6.py b/tests/unit/benchmark/scenarios/networking/test_ping6.py
index ecce7cee5..d2be6f576 100644
--- a/tests/unit/benchmark/scenarios/networking/test_ping6.py
+++ b/tests/unit/benchmark/scenarios/networking/test_ping6.py
@@ -59,7 +59,7 @@ class PingTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.return_value = (0, '0', '')
         p.setup()
 
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     @mock.patch('yardstick.benchmark.scenarios.networking.ping6.ssh')
     def test_ping_successful_no_sla(self, mock_ssh):
diff --git a/tests/unit/benchmark/scenarios/networking/test_pktgen.py b/tests/unit/benchmark/scenarios/networking/test_pktgen.py
index 71d20e5fe..005b53177 100644
--- a/tests/unit/benchmark/scenarios/networking/test_pktgen.py
+++ b/tests/unit/benchmark/scenarios/networking/test_pktgen.py
@@ -50,7 +50,7 @@ class PktgenTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         self.assertIsNotNone(p.server)
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_pktgen_successful_iptables_setup(self, mock_ssh):
 
diff --git a/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py b/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py
index 19c84e855..c9eec4b94 100644
--- a/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py
+++ b/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py
@@ -61,7 +61,7 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
         self.mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         self.assertIsNotNone(p.server)
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_pktgen_dpdk_successful_get_port_ip(self):
 
diff --git a/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk_throughput.py b/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk_throughput.py
index 8ac0763ba..c2e35af75 100644
--- a/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk_throughput.py
+++ b/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk_throughput.py
@@ -55,7 +55,7 @@ class PktgenDPDKTestCase(unittest.TestCase):
         mock_ssh.SSH().execute.return_value = (0, '', '')
         self.assertIsNotNone(p.server)
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_pktgen_dpdk_throughput_successful_no_sla(self, mock_ssh):
         args = {
@@ -172,7 +172,7 @@ class PktgenDPDKTestCase(unittest.TestCase):
 
         p.dpdk_setup()
 
-        self.assertEqual(p.dpdk_setup_done, True)
+        self.assertTrue(p.dpdk_setup_done)
 
     def test_pktgen_dpdk_throughput_dpdk_get_result(self, mock_ssh):
         args = {
diff --git a/tests/unit/benchmark/scenarios/networking/test_vsperf.py b/tests/unit/benchmark/scenarios/networking/test_vsperf.py
index cbbfc2b34..be8ac55d0 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vsperf.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vsperf.py
@@ -66,7 +66,7 @@ class VsperfTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_vsperf_teardown(self, mock_ssh, mock_subprocess):
         p = vsperf.Vsperf(self.args, self.ctx)
@@ -77,10 +77,10 @@ class VsperfTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         p.teardown()
-        self.assertEqual(p.setup_done, False)
+        self.assertFalse(p.setup_done)
 
     def test_vsperf_run_ok(self, mock_ssh, mock_subprocess):
         p = vsperf.Vsperf(self.args, self.ctx)
diff --git a/tests/unit/benchmark/scenarios/networking/test_vsperf_dpdk.py b/tests/unit/benchmark/scenarios/networking/test_vsperf_dpdk.py
index ab3d815c5..fbe3ed804 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vsperf_dpdk.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vsperf_dpdk.py
@@ -79,7 +79,7 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
     def test_vsperf_dpdk_teardown(self, mock_subprocess):
         p = vsperf_dpdk.VsperfDPDK(self.args, self.ctx)
@@ -89,10 +89,10 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         p.teardown()
-        self.assertEqual(p.setup_done, False)
+        self.assertFalse(p.setup_done)
 
     def test_vsperf_dpdk_is_dpdk_setup_no(self, mock_subprocess):
         p = vsperf_dpdk.VsperfDPDK(self.args, self.ctx)
@@ -102,13 +102,13 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         # is_dpdk_setup() specific mocks
         self.mock_ssh.SSH.from_node().execute.return_value = (0, 'dummy', '')
 
         result = p._is_dpdk_setup()
-        self.assertEqual(result, False)
+        self.assertFalse(result)
 
     def test_vsperf_dpdk_is_dpdk_setup_yes(self, mock_subprocess):
         p = vsperf_dpdk.VsperfDPDK(self.args, self.ctx)
@@ -118,13 +118,13 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         # is_dpdk_setup() specific mocks
         self.mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
 
         result = p._is_dpdk_setup()
-        self.assertEqual(result, True)
+        self.assertTrue(result)
 
     @mock.patch('time.sleep')
     def test_vsperf_dpdk_dpdk_setup_first(self, _, mock_subprocess):
@@ -135,14 +135,14 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         # is_dpdk_setup() specific mocks
         self.mock_ssh.SSH.from_node().execute.return_value = (0, 'dummy', '')
 
         p.dpdk_setup()
-        self.assertEqual(p._is_dpdk_setup(), False)
-        self.assertEqual(p.dpdk_setup_done, True)
+        self.assertFalse(p._is_dpdk_setup())
+        self.assertTrue(p.dpdk_setup_done)
 
     @mock.patch('time.sleep')
     def test_vsperf_dpdk_dpdk_setup_next(self, _, mock_subprocess):
@@ -154,11 +154,11 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         p.dpdk_setup()
-        self.assertEqual(p._is_dpdk_setup(), True)
-        self.assertEqual(p.dpdk_setup_done, True)
+        self.assertTrue(p._is_dpdk_setup())
+        self.assertTrue(p.dpdk_setup_done)
 
     @mock.patch('time.sleep')
     def test_vsperf_dpdk_dpdk_setup_fail(self, _, mock_subprocess):
@@ -171,7 +171,7 @@ class VsperfDPDKTestCase(unittest.TestCase):
         p.setup()
         self.assertIsNotNone(p.client)
         self.mock_ssh.SSH.from_node().execute.return_value = (1, '', '')
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         self.assertRaises(RuntimeError, p.dpdk_setup)
 
@@ -185,7 +185,7 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         # run() specific mocks
         mock_subprocess.call().execute.return_value = None
@@ -206,7 +206,7 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         # run() specific mocks
         mock_subprocess.call().execute.return_value = None
@@ -225,7 +225,7 @@ class VsperfDPDKTestCase(unittest.TestCase):
 
         p.setup()
         self.assertIsNotNone(p.client)
-        self.assertEqual(p.setup_done, True)
+        self.assertTrue(p.setup_done)
 
         # run() specific mocks
         mock_subprocess.call().execute.return_value = None