diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-01-26 21:12:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-26 21:12:01 +0000 |
| commit | e6b6f6fca60322f57329d1c93a01c88c3c81b62c (patch) | |
| tree | 4bceaafce8756246a9e2b46d5ddb791144b3462b /tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py | |
| parent | 868db57177cdbbebf8d160ca049cdf81fda3a2f4 (diff) | |
| parent | 298e2e529e815f31c7ae5e0e1154a7fdac92a067 (diff) | |
Merge changes from topic 'bug/yardstick-864'
* changes:
Replace assertEquals with assertEqual
Make files pep8 compliant before using assertTrue|False
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 | 5 |
1 files changed, 2 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 63b2ac4ab..f8ff60288 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 @@ -238,7 +238,7 @@ class TestPingTrafficGen(unittest.TestCase): self.assertIsInstance(ping_traffic_gen.setup_helper, PingSetupEnvHelper) self.assertIsInstance(ping_traffic_gen.resource_helper, PingResourceHelper) - self.assertEquals(ping_traffic_gen._result, {}) + self.assertEqual(ping_traffic_gen._result, {}) @mock.patch("yardstick.ssh.SSH") def test__bind_device_kernel_with_failure(self, ssh): @@ -282,8 +282,7 @@ class TestPingTrafficGen(unittest.TestCase): self.assertEqual(self.CMD_KWARGS, ping_traffic_gen.resource_helper.cmd_kwargs) self.assertIsNotNone(ping_traffic_gen._result) - @mock.patch("yardstick.ssh.SSH") - def test_listen_traffic(self, *args): + def test_listen_traffic(self): ping_traffic_gen = PingTrafficGen('vnf1', self.VNFD_0) self.assertIsNone(ping_traffic_gen.listen_traffic({})) |