From: Ross Brattain Date: Tue, 16 May 2017 22:39:42 +0000 (-0700) Subject: fix multi-monitor unitest hang X-Git-Tag: opnfv-5.0.RC1~473 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5271e612d427b29c2da84f8417f4192427ae3977;p=yardstick.git fix multi-monitor unitest hang need to mock SSH.from_node().execute.return_value because we switch most SSH calls to use from_node() factory function Change-Id: Ibea525c2fcc243d41de8ccbcd40bc98532d69006 Signed-off-by: Ross Brattain --- diff --git a/tests/unit/benchmark/scenarios/availability/test_monitor_multi.py b/tests/unit/benchmark/scenarios/availability/test_monitor_multi.py index 9539f27d0..5719f286a 100644 --- a/tests/unit/benchmark/scenarios/availability/test_monitor_multi.py +++ b/tests/unit/benchmark/scenarios/availability/test_monitor_multi.py @@ -42,20 +42,20 @@ class MultiMonitorServiceTestCase(unittest.TestCase): } def test__monitor_multi_all_successful(self, mock_open, mock_ssh): - ins = monitor_multi.MultiMonitor(self.monitor_cfg, self.context); + ins = monitor_multi.MultiMonitor(self.monitor_cfg, self.context) - mock_ssh.SSH().execute.return_value = (0, "running", '') + mock_ssh.SSH.from_node().execute.return_value = (0, "running", '') - ins.start_monitor(); - ins.wait_monitor(); + ins.start_monitor() + ins.wait_monitor() ins.verify_SLA() def test__monitor_multi_all_fail(self, mock_open, mock_ssh): - ins = monitor_multi.MultiMonitor(self.monitor_cfg, self.context); + ins = monitor_multi.MultiMonitor(self.monitor_cfg, self.context) - mock_ssh.SSH().execute.return_value = (1, "failed", '') + mock_ssh.SSH.from_node().execute.return_value = (0, "running", '') - ins.start_monitor(); - ins.wait_monitor(); + ins.start_monitor() + ins.wait_monitor() ins.verify_SLA()