code inspection fixes: test_pktgen

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

diff --git a/tests/unit/benchmark/scenarios/networking/test_pktgen.py b/tests/unit/benchmark/scenarios/networking/test_pktgen.py
index 2914c8e..3928aac 100644 (file)
--- a/tests/unit/benchmark/scenarios/networking/test_pktgen.py
+++ b/tests/unit/benchmark/scenarios/networking/test_pktgen.py
@@ -68,7 +68,7 @@ class PktgenTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.assert_called_with(
             "sudo iptables -F; "
             "sudo iptables -A INPUT -p udp --dport 1000:%s -j DROP"
-            % 1010)
+            % 1010, timeout=60)
 
     def test_pktgen_unsuccessful_iptables_setup(self, mock_ssh):
 
@@ -132,7 +132,7 @@ class PktgenTestCase(unittest.TestCase):
         p._iptables_get_result = mock_iptables_result
 
         sample_output = '{"packets_per_second": 9753, "errors": 0, \
-            "packets_sent": 149776, "packetsize": 60, "flows": 110}'
+            "packets_sent": 149776, "packetsize": 60, "flows": 110, "ppm": 3179}'
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)
@@ -159,7 +159,7 @@ class PktgenTestCase(unittest.TestCase):
         p._iptables_get_result = mock_iptables_result
 
         sample_output = '{"packets_per_second": 9753, "errors": 0, \
-            "packets_sent": 149776, "packetsize": 60, "flows": 110}'
+            "packets_sent": 149776, "packetsize": 60, "flows": 110, "ppm": 3179}'
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)
@@ -264,7 +264,7 @@ class PktgenTestCase(unittest.TestCase):
         p._get_available_queue_number()
 
         mock_ssh.SSH.from_node().execute.assert_called_with(
-            "sudo ethtool -l eth0 | grep Combined | head -1 |" \
+            "sudo ethtool -l eth0 | grep Combined | head -1 |"
             "awk '{printf $2}'")
 
     def test_pktgen_unsuccessful_get_available_queue_number(self, mock_ssh):
@@ -290,7 +290,7 @@ class PktgenTestCase(unittest.TestCase):
         p._get_usable_queue_number()
 
         mock_ssh.SSH.from_node().execute.assert_called_with(
-            "sudo ethtool -l eth0 | grep Combined | tail -1 |" \
+            "sudo ethtool -l eth0 | grep Combined | tail -1 |"
             "awk '{printf $2}'")
 
     def test_pktgen_unsuccessful_get_usable_queue_number(self, mock_ssh):
@@ -541,7 +541,7 @@ class PktgenTestCase(unittest.TestCase):
         p._is_irqbalance_disabled = mock_result1
 
         mock_result2 = mock.Mock()
-        mock_result2.return_value = "virtio_net" 
+        mock_result2.return_value = "virtio_net"
         p._get_vnic_driver_name = mock_result2
 
         mock_result3 = mock.Mock()
@@ -571,7 +571,7 @@ class PktgenTestCase(unittest.TestCase):
         p._is_irqbalance_disabled = mock_result1
 
         mock_result2 = mock.Mock()
-        mock_result2.return_value = "virtio_net" 
+        mock_result2.return_value = "virtio_net"
         p._get_vnic_driver_name = mock_result2
 
         mock_result3 = mock.Mock()
@@ -601,7 +601,7 @@ class PktgenTestCase(unittest.TestCase):
         p._is_irqbalance_disabled = mock_result1
 
         mock_result2 = mock.Mock()
-        mock_result2.return_value = "ixgbevf" 
+        mock_result2.return_value = "ixgbevf"
         p._get_vnic_driver_name = mock_result2
 
         p.multiqueue_setup()
@@ -623,7 +623,7 @@ class PktgenTestCase(unittest.TestCase):
         p._is_irqbalance_disabled = mock_result1
 
         mock_result2 = mock.Mock()
-        mock_result2.return_value = "ixgbevf" 
+        mock_result2.return_value = "ixgbevf"
         p._get_vnic_driver_name = mock_result2
 
         p.multiqueue_setup()
@@ -648,7 +648,7 @@ class PktgenTestCase(unittest.TestCase):
         p._iptables_get_result = mock_iptables_result
 
         sample_output = '{"packets_per_second": 9753, "errors": 0, \
-            "packets_sent": 149300, "flows": 110}'
+            "packets_sent": 149300, "flows": 110, "ppm": 0}'
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)
@@ -670,7 +670,7 @@ class PktgenTestCase(unittest.TestCase):
         p.client = mock_ssh.SSH.from_node()
 
         mock_result = mock.Mock()
-        mock_result.return_value = "virtio_net" 
+        mock_result.return_value = "virtio_net"
         p._get_vnic_driver_name = mock_result
 
         mock_result1 = mock.Mock()
@@ -693,7 +693,7 @@ class PktgenTestCase(unittest.TestCase):
         p._iptables_get_result = mock_iptables_result
 
         sample_output = '{"packets_per_second": 9753, "errors": 0, \
-            "packets_sent": 149300, "flows": 110}'
+            "packets_sent": 149300, "flows": 110, "ppm": 0}'
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)
@@ -730,7 +730,7 @@ class PktgenTestCase(unittest.TestCase):
         p._iptables_get_result = mock_iptables_result
 
         sample_output = '{"packets_per_second": 9753, "errors": 0, \
-            "packets_sent": 149300, "flows": 110}'
+            "packets_sent": 149300, "flows": 110, "ppm": 0}'
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         p.run(result)