Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "NFVi Test stops after one hour even if configured context duration is longer"
[yardstick.git]
/
tests
/
unit
/
network_services
/
vnf_generic
/
vnf
/
test_prox_helpers.py
diff --git
a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
index
ac67cc5
..
faceeb6
100644
(file)
--- a/
tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
+++ b/
tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
@@
-1,5
+1,3
@@
-#!/usr/bin/env python
-
# Copyright (c) 2016-2017 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright (c) 2016-2017 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-24,6
+22,7
@@
import mock
import unittest
from tests.unit import STL_MOCKS
import unittest
from tests.unit import STL_MOCKS
+from yardstick.common import utils
from yardstick.network_services.vnf_generic.vnf.base import VnfdHelper
from yardstick.network_services.vnf_generic.vnf.base import VnfdHelper
@@
-962,7
+961,7
@@
class TestProxDpdkVnfSetupEnvHelper(unittest.TestCase):
result = setup_helper.prox_config_data
self.assertEqual(result, expected)
result = setup_helper.prox_config_data
self.assertEqual(result, expected)
- @mock.patch
('yardstick.network_services.vnf_generic.vnf.prox_helpers.
find_relative_file')
+ @mock.patch
.object(utils, '
find_relative_file')
def test_build_config_file_no_additional_file(self, mock_find_path):
vnf1 = {
'prox_args': {'-c': ""},
def test_build_config_file_no_additional_file(self, mock_find_path):
vnf1 = {
'prox_args': {'-c': ""},
@@
-996,7
+995,7
@@
class TestProxDpdkVnfSetupEnvHelper(unittest.TestCase):
self.assertEqual(helper._prox_config_data, '4')
self.assertEqual(helper.remote_path, '5')
self.assertEqual(helper._prox_config_data, '4')
self.assertEqual(helper.remote_path, '5')
- @mock.patch
('yardstick.network_services.vnf_generic.vnf.prox_helpers.
find_relative_file')
+ @mock.patch
.object(utils, '
find_relative_file')
def test_build_config_file_additional_file_string(self, mock_find_path):
vnf1 = {
'prox_args': {'-c': ""},
def test_build_config_file_additional_file_string(self, mock_find_path):
vnf1 = {
'prox_args': {'-c': ""},
@@
-1028,7
+1027,7
@@
class TestProxDpdkVnfSetupEnvHelper(unittest.TestCase):
helper.build_config_file()
self.assertDictEqual(helper.additional_files, expected)
helper.build_config_file()
self.assertDictEqual(helper.additional_files, expected)
- @mock.patch
('yardstick.network_services.vnf_generic.vnf.prox_helpers.
find_relative_file')
+ @mock.patch
.object(utils, '
find_relative_file')
def test_build_config_file_additional_file(self, mock_find_path):
vnf1 = {
'prox_args': {'-c': ""},
def test_build_config_file_additional_file(self, mock_find_path):
vnf1 = {
'prox_args': {'-c': ""},