aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/benchmark/scenarios
diff options
context:
space:
mode:
authorKubi <jean.gaoliang@huawei.com>2017-02-06 09:47:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-06 09:47:50 +0000
commit0c99c83ffaa58757dd8d9c0bb3adef783f5cb037 (patch)
treee3e90cb135eb491b4cb94231e15645badf5f846c /tests/unit/benchmark/scenarios
parent4b86cc0678bcbd2ad2aac571bb40eb97a7ea65f7 (diff)
parentc1d6fd53c49a2cc5c0a7eab82e15dcf1a08f4e32 (diff)
Merge "Adding generic traffic profiles for trex traffic generator"
Diffstat (limited to 'tests/unit/benchmark/scenarios')
-rw-r--r--tests/unit/benchmark/scenarios/networking/test_vnf_generic.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 7dfd9e3a1..540d7f214 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -395,8 +395,8 @@ class TestNetworkServiceTestCase(unittest.TestCase):
self._get_file_abspath("ipv4_1flow_Packets_vpe.yaml")
self.scenario_cfg["traffic_options"]["imix"] = \
self._get_file_abspath("imix_voice.yaml")
- self.assertRaises(RuntimeError, self.s._fill_traffic_profile,
- self.scenario_cfg, self.context_cfg)
+ self.assertIsNotNone(self.s._fill_traffic_profile(self.scenario_cfg,
+ self.context_cfg))
def test_teardown(self):
vnf = mock.Mock(autospec=GenericVNF)