summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2017-02-07 17:16:28 +0200
committerHanoh Haim <hhaim@cisco.com>2017-02-07 17:16:28 +0200
commitca53bd59481c69447b3090e5c0596f45bdf83361 (patch)
treea959a5481e13e61978d98433599d80ca20d6b7b4
parent577bdd692a70148d640b8f6954add951c0f9fe5b (diff)
parent03a49691cf74dfdb4f1f39ed15b5ca1d40384c56 (diff)
Merge v2.17
-rwxr-xr-xscripts/automation/regression/stateless_tests/stl_ipv6_test.py4
-rwxr-xr-xscripts/automation/regression/trex_unit_test.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/automation/regression/stateless_tests/stl_ipv6_test.py b/scripts/automation/regression/stateless_tests/stl_ipv6_test.py
index 1fe248a3..3f740770 100755
--- a/scripts/automation/regression/stateless_tests/stl_ipv6_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_ipv6_test.py
@@ -19,7 +19,7 @@ class STLIPv6_Test(CStlGeneral_Test):
ping_count = 5
expected_replies = 4 # allow one loss
results = self.stl_trex.ping_ip(src_port = 0, dst_ip = 'ff02::1', count = ping_count)
- good_replies = len(filter(lambda result: result['status'] == 'success', results))
+ good_replies = len(list(filter(lambda result: result['status'] == 'success', results)))
if self.is_loopback:
# negative test, loopback
if good_replies > 0:
@@ -35,7 +35,7 @@ class STLIPv6_Test(CStlGeneral_Test):
# negative test, unknown IP
results = self.stl_trex.ping_ip(src_port = 0, dst_ip = '1234::1234', count = ping_count)
- good_replies = len(filter(lambda result: result['status'] == 'success', results))
+ good_replies = len(list(filter(lambda result: result['status'] == 'success', results)))
if good_replies > 0:
self.fail('We have answers from unknown IPv6, bug!\nOutput: %s' % results)
else:
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index ac6203bf..6d7f26f6 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -70,13 +70,13 @@ def id_split(idval):
# option to select wanted test by name without file, class etc.
def new_Selector_wantMethod(self, method, orig_Selector_wantMethod = Selector.wantMethod):
result = orig_Selector_wantMethod(self, method)
- return result and (not CTRexScenario.test or filter(lambda t: t in getattr(method, '__name__', ''), CTRexScenario.test.split(',')))
+ return result and (not CTRexScenario.test or list(filter(lambda t: t in getattr(method, '__name__', ''), CTRexScenario.test.split(','))))
Selector.wantMethod = new_Selector_wantMethod
def new_Selector_wantFunction(self, function, orig_Selector_wantFunction = Selector.wantFunction):
result = orig_Selector_wantFunction(self, function)
- return result and (not CTRexScenario.test or filter(lambda t: t in getattr(function, '__name__', ''), CTRexScenario.test.split(',')))
+ return result and (not CTRexScenario.test or list(filter(lambda t: t in getattr(function, '__name__', ''), CTRexScenario.test.split(','))))
Selector.wantFunction = new_Selector_wantFunction