X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Funit%2Fnetwork_services%2Ftraffic_profile%2Ftest_prox_acl.py;h=ef5bac0d54b39f7de4e6f009b99a43fee7d325bf;hb=5721849f3f08c2c1c89354341115c834e510b3d6;hp=be172f26b6b39231b6a22f5af44a7e635c60098b;hpb=1c587f5c883e49ba6457925d06b0ce4271d345a6;p=yardstick.git

diff --git a/tests/unit/network_services/traffic_profile/test_prox_acl.py b/tests/unit/network_services/traffic_profile/test_prox_acl.py
index be172f26b..ef5bac0d5 100644
--- a/tests/unit/network_services/traffic_profile/test_prox_acl.py
+++ b/tests/unit/network_services/traffic_profile/test_prox_acl.py
@@ -29,38 +29,50 @@ if stl_patch:
     from yardstick.network_services.vnf_generic.vnf.prox_helpers import ProxTestDataTuple
 
 
-class TestProxRampProfile(unittest.TestCase):
+class TestProxACLProfile(unittest.TestCase):
 
     def test_run_test_with_pkt_size(self):
+        def target(*args, **kwargs):
+            runs.append(args[2])
+            if args[2] < 0 or args[2] > 100:
+                raise RuntimeError(' '.join([str(args), str(runs)]))
+            if args[2] > 75.0:
+                return fail_tuple, {}
+            return success_tuple, {}
+
+        def get_mock_samples(*args, **kwargs):
+            if args[2] < 0:
+                raise RuntimeError(' '.join([str(args), str(runs)]))
+            return success_tuple
+
         tp_config = {
-            'traffic_profile': {
+           'traffic_profile': {
                 'upper_bound': 100.0,
+                'lower_bound': 0.0,
+                'tolerated_loss': 50.0,
+                'attempts': 20
             },
         }
 
+        runs = []
         success_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.1, 5.2, 5.3], 995, 1000, 123.4)
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
         traffic_gen = mock.MagicMock()
-        traffic_gen.resource_helper.run_test.side_effect = [
-            success_tuple,
-            success_tuple,
-            success_tuple,
-            fail_tuple,
-            success_tuple,
-            fail_tuple,
-            fail_tuple,
-            fail_tuple,
-        ]
-
-        fill_values = [1, 2, 3, 4, RuntimeError]
+
+        profile_helper = mock.MagicMock()
+        profile_helper.run_test = target
 
         profile = ProxACLProfile(tp_config)
-        profile.fill_samples = fill_samples = mock.MagicMock(side_effect=fill_values)
-        profile.queue = mock.MagicMock()
+        profile.init(mock.MagicMock())
 
-        with self.assertRaises(RuntimeError):
-            profile.run_test_with_pkt_size(traffic_gen, 128, 30)
+        profile.prox_config["attempts"] = 20
+        profile.queue = mock.MagicMock()
+        profile.tolerated_loss = 50.0
+        profile.pkt_size = 128
+        profile.duration = 30
+        profile.test_value = 100.0
+        profile.tolerated_loss = 100.0
+        profile._profile_helper = profile_helper
 
-        self.assertEqual(traffic_gen.resource_helper.run_test.call_count, 5)
-        self.assertEqual(fill_samples.call_count, 5)
+        profile.run_test_with_pkt_size(traffic_gen, profile.pkt_size, profile.duration)