diff options
author | 2018-03-01 15:11:03 +0000 | |
---|---|---|
committer | 2018-03-01 15:11:03 +0000 | |
commit | 9a71438273cefd57c652b6049c697bdf137088c8 (patch) | |
tree | 7ef9fe6f5e357eee8b77cd5c08df64bea915937c /tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py | |
parent | 14a0f0b13e37cf0a65603915b7c75b86fd4a4383 (diff) | |
parent | d08a8d477fd7b9fb88855b12ee53eafa07e79afa (diff) |
Merge "Import "traffic_profile" modules only once"
Diffstat (limited to 'tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py')
-rw-r--r-- | tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py b/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py index e9f718cb7..aeabc367a 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py @@ -16,8 +16,10 @@ # import os -import unittest + import mock +import six +import unittest from tests.unit import STL_MOCKS @@ -341,7 +343,7 @@ class TestIXIATrafficGen(unittest.TestCase): 'task_path': '/path/to/task' } - @mock.patch('yardstick.benchmark.scenarios.networking.vnf_generic.open', create=True) + @mock.patch.object(six.moves.builtins, 'open', create=True) @mock.patch('yardstick.network_services.vnf_generic.vnf.tg_rfc2544_ixia.open', mock.mock_open(), create=True) @mock.patch('yardstick.network_services.vnf_generic.vnf.tg_rfc2544_ixia.LOG.exception') |