Change in osmo-gsm-tester[master]: bts_osmo: Only check for socket path in ready_for_pcu()

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11195 )

Change subject: bts_osmo: Only check for socket path in ready_for_pcu()
......................................................................

bts_osmo: Only check for socket path in ready_for_pcu()

Previous implementation was done due to osmo-pcu dying if failed to
connect to not-yet prepared BTS. This is no longer the case, so we can
start osmo-pcu as soon as the socket exists.

Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3
---
M src/osmo_gsm_tester/bts_osmo.py
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py
index 32784bd..89572ec 100644
--- a/src/osmo_gsm_tester/bts_osmo.py
+++ b/src/osmo_gsm_tester/bts_osmo.py
@@ -61,10 +61,10 @@
         # coming from bts.Bts, we forward the implementation to children.
         pass
 
+    @abstractmethod
     def ready_for_pcu(self):
-        if not self.proc_bts or not self.proc_bts.is_running:
-            return False
-        return 'BTS is up' in (self.proc_bts.get_stderr() or '')
+        'Used by tests to know when BTS is prepared and PCU can be started.'
+        pass
 
     def pcu(self):
         if self._pcu is None:
@@ -107,6 +107,11 @@
 ###################
 # PUBLIC (test API included)
 ###################
+    def ready_for_pcu(self):
+        if not self.proc_bts or not self.proc_bts.is_running:
+            return False
+        return os.path.exists(self.pcu_socket_path())
+
     @abstractmethod
     def start(self, keepalive=False):
         # coming from bts.Bts, we forward the implementation to children.

-- 
To view, visit https://gerrit.osmocom.org/11195
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3
Gerrit-Change-Number: 11195
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181003/09ba083f/attachment.htm>