Change in osmo-gsm-tester[master]: ms_srs: wait 6s before copying back UE metrics

[srs_andre]

srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18471 )


Change subject: ms_srs: wait 6s before copying back UE metrics
......................................................................

ms_srs: wait 6s before copying back UE metrics

we've only waited when running with ZMQ but in fact we need
to always wait because the UE may need some time to send
the detach request and shut down correctly.

Change-Id: I47e46b8ccce41c9a62d2d6866260d22c927e710d
---
M src/osmo_gsm_tester/obj/ms_srs.py
1 file changed, 4 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/71/18471/1

diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index b494c54..fc60044 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -108,12 +108,7 @@
             return
         if self.setup_runs_locally():
             return
-        # When using zmq, srsUE is known to hang for a few seconds before
-        # exiting (3 seconds after alarm() watchdog kicks in). We hence need to
-        # wait to make sure the remote process terminated and the file was
-        # flushed, since cleanup() triggered means only the local ssh client was killed.
-        if self._conf and self._conf.get('rf_dev_type', '') == 'zmq':
-            MainLoop.sleep(self, 3)
+
         # copy back files (may not exist, for instance if there was an early error of process):
         try:
             self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file)
@@ -341,9 +336,9 @@
         # file is not properly flushed until the process has stopped.
         if self.running():
             self.stop()
-            # metrics file is not flushed immediatelly by the OS during process
-            # tear down, we need to wait some extra time:
-            MainLoop.sleep(self, 2)
+            # srsUE at most requires 5s to stop
+            MainLoop.sleep(self, 6)
+
             if not self.setup_runs_locally():
                 try:
                     self.rem_host.scpfrom('scp-back-metrics', self.remote_metrics_file, self.metrics_file)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18471
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I47e46b8ccce41c9a62d2d6866260d22c927e710d
Gerrit-Change-Number: 18471
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200525/3dc6cfcb/attachment.htm>