merge from master

2 files changed, 12 insertions, 15 deletions

diff --git a/scripts/automation/regression/stateless_tests/stl_benchmark_test.py b/scripts/automation/regression/stateless_tests/stl_benchmark_test.py
index ef4c435f..c2c11cc7 100755
--- a/scripts/automation/regression/stateless_tests/stl_benchmark_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_benchmark_test.py
@@ -51,15 +51,18 @@ class STLBenchmark_Test(CStlGeneral_Test):
 
             # report benchmarks
             if self.GAManager:
-                profile_repr = '%s.%s %s' % (CTRexScenario.setup_name,
-                                             os.path.basename(profile_bench['name']),
-                                             repr(kwargs).replace("'", ''))
-                self.GAManager.gaAddAction(Event = 'stateless_test', action = profile_repr,
-                                           label = 'bw_per_core', value = int(agv_bw_per_core))
-                # TODO: report expected once acquired
-                #self.GAManager.gaAddAction(Event = 'stateless_test', action = profile_repr,
-                #                           label = 'bw_per_core_exp', value = int(expected_norm_cpu))
-                self.GAManager.emptyAndReportQ()
+                try:
+                    profile_repr = '%s.%s %s' % (CTRexScenario.setup_name,
+                                                os.path.basename(profile_bench['name']),
+                                                repr(kwargs).replace("'", ''))
+                    self.GAManager.gaAddAction(Event = 'stateless_test', action = profile_repr,
+                                            label = 'bw_per_core', value = int(agv_bw_per_core))
+                    # TODO: report expected once acquired
+                    #self.GAManager.gaAddAction(Event = 'stateless_test', action = profile_repr,
+                    #                           label = 'bw_per_core_exp', value = int(expected_norm_cpu))
+                    self.GAManager.emptyAndReportQ()
+                except Exception as e:
+                    print('Sending GA failed: %s' % e)
 
     def tearDown(self):
         self.stl_trex.reset()
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()