summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-07-19 08:16:28 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-19 08:16:28 +0000
commit1f17dacf4548d8a939b134ab573108d15432c162 (patch)
treed787a2cf692a97220e6aafeb477433db8b49e1b6 /tests/unit
parentcbb35b49da2d8d491ded038a525e4107b37fae74 (diff)
parent316a5c029e785bdc25efbbbf6fa093502bda3094 (diff)
Merge "Bug fix and extended unit tests"
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/benchmark/scenarios/networking/test_sfc.py18
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/unit/benchmark/scenarios/networking/test_sfc.py b/tests/unit/benchmark/scenarios/networking/test_sfc.py
index 2d7990e59..618efc32e 100644
--- 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()