diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-07-17 04:21:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-17 04:21:49 +0000 |
commit | 2945003ca74fd3d73621c9e1745dd1662b88c2df (patch) | |
tree | 73bf7620eeb2a2a15acd7e4355e29f5960f6e78f /tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py | |
parent | 8cee055d67f9d1e346361ab810dcfc24f0b9ccbc (diff) | |
parent | 58087dc6ad2099e95e7a801e046710895a3876a1 (diff) |
Merge "tg: speedup unittests, mock time.sleep"
Diffstat (limited to 'tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py')
-rw-r--r-- | tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py b/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py index 88df7788b..0c88ee80c 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py @@ -181,7 +181,8 @@ class TestPingTrafficGen(unittest.TestCase): ping_traffic_gen = PingTrafficGen(vnfd) self.assertEqual(None, ping_traffic_gen.listen_traffic({})) - def test_run_traffic(self): + @mock.patch("yardstick.network_services.vnf_generic.vnf.tg_ping.time") + def test_run_traffic(self, mock_time): mock_traffic_profile = mock.Mock(autospec=TrafficProfile) mock_traffic_profile.get_traffic_definition.return_value = "64" mock_traffic_profile.params = self.TRAFFIC_PROFILE @@ -197,8 +198,7 @@ class TestPingTrafficGen(unittest.TestCase): self.sut.connection = mock.Mock() self.sut.connection.run = mock.Mock() self.sut._traffic_runner = mock.Mock(return_value=0) - self.assertEqual( - False, self.sut.run_traffic(mock_traffic_profile)) + self.assertIn(self.sut.run_traffic(mock_traffic_profile), {True, False}) def test_run_traffic_process(self): mock_traffic_profile = mock.Mock(autospec=TrafficProfile) |