summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-05-10 11:37:26 +0300
committerYaroslav Brustinov <ybrustin@cisco.com>2016-05-10 11:37:26 +0300
commitdc622bd308ae9ba17eda57881e809dbbc5d2dd01 (patch)
treeba7e8228af1368c48a6c786a73f7f2f0df02574f
parentba731d02eadc3c2f0c13493e518a167d199b41e7 (diff)
parent79d632c3f2fce07dede708bf36b47d1ad78386dd (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--scripts/automation/regression/stateless_tests/stl_client_test.py6
-rwxr-xr-xscripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py3
2 files changed, 3 insertions, 6 deletions
diff --git a/scripts/automation/regression/stateless_tests/stl_client_test.py b/scripts/automation/regression/stateless_tests/stl_client_test.py
index e7c9bb5d..10f56b3f 100644
--- a/scripts/automation/regression/stateless_tests/stl_client_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_client_test.py
@@ -84,9 +84,6 @@ class STLClient_Test(CStlGeneral_Test):
self.c.clear_stats()
self.c.start(ports = [self.tx_port, self.rx_port])
- assert self.c.ports[self.tx_port].is_transmitting(), 'port should be active'
- assert self.c.ports[self.rx_port].is_transmitting(), 'port should be active'
-
self.c.wait_on_traffic(ports = [self.tx_port, self.rx_port])
stats = self.c.get_stats()
@@ -124,9 +121,6 @@ class STLClient_Test(CStlGeneral_Test):
self.c.clear_stats()
self.c.start(ports = [self.tx_port, self.rx_port])
- assert self.c.ports[self.tx_port].is_transmitting(), 'port should be active'
- assert self.c.ports[self.rx_port].is_transmitting(), 'port should be active'
-
self.c.wait_on_traffic(ports = [self.tx_port, self.rx_port])
stats = self.c.get_stats()
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
index d1352804..5e20adb8 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
@@ -854,6 +854,9 @@ class STLClient(object):
# clear stats
def __clear_stats(self, port_id_list, clear_global, clear_flow_stats):
+ # we must be sync with the server
+ self.async_client.barrier()
+
for port_id in port_id_list:
self.ports[port_id].clear_stats()