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

[yardstick.git] / tests / unit / benchmark / scenarios / networking / test_pktgen_dpdk.py

diff --git a/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py b/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py
index 7ba4db9..c9eec4b 100644 (file)
--- a/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py
+++ b/tests/unit/benchmark/scenarios/networking/test_pktgen_dpdk.py
@@ -16,10 +16,10 @@ import unittest
 
 import mock
 
+import yardstick.common.utils as utils
 from yardstick.benchmark.scenarios.networking import pktgen_dpdk
 
 
-@mock.patch('yardstick.benchmark.scenarios.networking.pktgen_dpdk.ssh')
 class PktgenDPDKLatencyTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -37,7 +37,20 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
             }
         }
 
-    def test_pktgen_dpdk_successful_setup(self, mock_ssh):
+        self._mock_ssh = mock.patch(
+            'yardstick.benchmark.scenarios.networking.pktgen_dpdk.ssh')
+        self.mock_ssh = self._mock_ssh.start()
+        self._mock_time = mock.patch(
+            'yardstick.benchmark.scenarios.networking.pktgen_dpdk.time')
+        self.mock_time = self._mock_time.start()
+
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_ssh.stop()
+        self._mock_time.stop()
+
+    def test_pktgen_dpdk_successful_setup(self):
 
         args = {
             'options': {'packetsize': 60},
@@ -45,67 +58,66 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
         p.setup()
 
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        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, mock_ssh):
+    def test_pktgen_dpdk_successful_get_port_ip(self):
 
         args = {
             'options': {'packetsize': 60},
         }
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
-        p.server = mock_ssh.SSH()
+        p.server = self.mock_ssh.SSH.from_node()
 
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        self.mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
 
-        p.get_port_ip(p.server, "eth1")
+        utils.get_port_ip(p.server, "eth1")
 
-        mock_ssh.SSH().execute.assert_called_with(
-            "ifconfig eth1 |grep 'inet addr' |awk '{print $2}' \
-            |cut -d ':' -f2 ")
+        self.mock_ssh.SSH.from_node().execute.assert_called_with(
+            "ifconfig eth1 |grep 'inet addr' |awk '{print $2}' |cut -d ':' -f2 ")
 
-    def test_pktgen_dpdk_unsuccessful_get_port_ip(self, mock_ssh):
+    def test_pktgen_dpdk_unsuccessful_get_port_ip(self):
 
         args = {
             'options': {'packetsize': 60},
         }
 
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
-        p.server = mock_ssh.SSH()
+        p.server = self.mock_ssh.SSH.from_node()
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, p.get_port_ip, p.server, "eth1")
+        self.mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
+        self.assertRaises(RuntimeError, utils.get_port_ip, p.server, "eth1")
 
-    def test_pktgen_dpdk_successful_get_port_mac(self, mock_ssh):
+    def test_pktgen_dpdk_successful_get_port_mac(self):
 
         args = {
             'options': {'packetsize': 60},
         }
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
-        p.server = mock_ssh.SSH()
+        p.server = self.mock_ssh.SSH.from_node()
 
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        self.mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
 
-        p.get_port_mac(p.server, "eth1")
+        utils.get_port_mac(p.server, "eth1")
 
-        mock_ssh.SSH().execute.assert_called_with(
+        self.mock_ssh.SSH.from_node().execute.assert_called_with(
             "ifconfig |grep HWaddr |grep eth1 |awk '{print $5}' ")
 
-    def test_pktgen_dpdk_unsuccessful_get_port_mac(self, mock_ssh):
+    def test_pktgen_dpdk_unsuccessful_get_port_mac(self):
 
         args = {
             'options': {'packetsize': 60},
         }
 
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
-        p.server = mock_ssh.SSH()
+        p.server = self.mock_ssh.SSH.from_node()
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, p.get_port_mac, p.server, "eth1")
+        self.mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
+        self.assertRaises(RuntimeError, utils.get_port_mac, p.server, "eth1")
 
-    def test_pktgen_dpdk_successful_no_sla(self, mock_ssh):
+    def test_pktgen_dpdk_successful_no_sla(self):
 
         args = {
             'options': {'packetsize': 60},
@@ -115,7 +127,7 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
 
         sample_output = '100\n110\n112\n130\n149\n150\n90\n150\n200\n162\n'
-        mock_ssh.SSH().execute.return_value = (0, sample_output, '')
+        self.mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)
         # with python 3 we get float, might be due python division changes
@@ -124,7 +136,7 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
         delta = result['avg_latency'] - 132
         self.assertLessEqual(delta, 1)
 
-    def test_pktgen_dpdk_successful_sla(self, mock_ssh):
+    def test_pktgen_dpdk_successful_sla(self):
 
         args = {
             'options': {'packetsize': 60},
@@ -135,13 +147,13 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
 
         sample_output = '100\n100\n100\n100\n100\n100\n100\n100\n100\n100\n'
-        mock_ssh.SSH().execute.return_value = (0, sample_output, '')
+        self.mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)
 
         self.assertEqual(result, {"avg_latency": 100})
 
-    def test_pktgen_dpdk_unsuccessful_sla(self, mock_ssh):
+    def test_pktgen_dpdk_unsuccessful_sla(self):
 
         args = {
             'options': {'packetsize': 60},
@@ -151,14 +163,14 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
 
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
 
-        p.server = mock_ssh.SSH()
-        p.client = mock_ssh.SSH()
+        p.server = self.mock_ssh.SSH.from_node()
+        p.client = self.mock_ssh.SSH.from_node()
 
         sample_output = '100\n110\n112\n130\n149\n150\n90\n150\n200\n162\n'
-        mock_ssh.SSH().execute.return_value = (0, sample_output, '')
+        self.mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
         self.assertRaises(AssertionError, p.run, result)
 
-    def test_pktgen_dpdk_unsuccessful_script_error(self, mock_ssh):
+    def test_pktgen_dpdk_unsuccessful_script_error(self):
 
         args = {
             'options': {'packetsize': 60},
@@ -168,7 +180,7 @@ class PktgenDPDKLatencyTestCase(unittest.TestCase):
 
         p = pktgen_dpdk.PktgenDPDKLatency(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
+        self.mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
         self.assertRaises(RuntimeError, p.run, result)