Bug fix and extended unit tests

There was a bug in how the mock was created and a new unit test is added
in order to cover the "else" of the if conditions

Change-Id: I3c8dfcd81240cb93ecdec1f63f7974f5342947c0
Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>

diff --git a/tests/unit/benchmark/scenarios/networking/test_sfc.py b/tests/unit/benchmark/scenarios/networking/test_sfc.py
index 2d7990e..618efc3 100644 (file)
--- a/tests/unit/benchmark/scenarios/networking/test_sfc.py
+++ b/tests/unit/benchmark/scenarios/networking/test_sfc.py
@@ -45,8 +45,22 @@ class SfcTestCase(unittest.TestCase):
     def test_run_for_success(self, mock_subprocess, mock_openstack, mock_ssh):
         # Mock a successfull SSH in Sfc.setup() and Sfc.run()
         mock_ssh.SSH().execute.return_value = (0, '100', '')
-        mock_openstack.return_value = "127.0.0.1"
-        mock_subprocess.return_value = 'mocked!'
+        mock_openstack.get_an_IP.return_value = "127.0.0.1"
+        mock_subprocess.call.return_value = 'mocked!'
+
+        result = {}
+        self.sfc.setup()
+        self.sfc.run(result)
+        self.sfc.teardown()
+
+    @mock.patch('yardstick.benchmark.scenarios.networking.sfc.ssh')
+    @mock.patch('yardstick.benchmark.scenarios.networking.sfc.sfc_openstack')
+    @mock.patch('yardstick.benchmark.scenarios.networking.sfc.subprocess')
+    def test2_run_for_success(self, mock_subprocess, mock_openstack, mock_ssh):
+        # Mock a successfull SSH in Sfc.setup() and Sfc.run()
+        mock_ssh.SSH().execute.return_value = (0, 'vxlan_tool.py', 'succeeded timed out')
+        mock_openstack.get_an_IP.return_value = "127.0.0.1"
+        mock_subprocess.call.return_value = 'mocked!'
 
         result = {}
         self.sfc.setup()