Change in osmo-gsm-tester[master]: nanobts: ipacces-config: Use process.launch_sync helper

[Pau Espin Pedrol]

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

Change subject: nanobts: ipacces-config: Use process.launch_sync helper
......................................................................

nanobts: ipacces-config: Use process.launch_sync helper

Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9
---
M src/osmo_gsm_tester/bts_nanobts.py
1 file changed, 3 insertions(+), 9 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py
index bec2433..ab75b16 100644
--- a/src/osmo_gsm_tester/bts_nanobts.py
+++ b/src/osmo_gsm_tester/bts_nanobts.py
@@ -253,7 +253,7 @@
         self.bts_ip = bts_ip
         self.env = {}
 
-    def launch_process(self, binary_name, *args):
+    def create_process(self, binary_name, *args):
         binary = os.path.abspath(self.inst.child('bin', binary_name))
         run_dir = self.run_dir.new_dir(binary_name)
         if not os.path.isfile(binary):
@@ -261,7 +261,6 @@
         proc = process.Process(binary_name, run_dir,
                                (binary,) + args,
                                env=self.env)
-        proc.launch()
         return proc
 
     def run(self, name_suffix, *args):
@@ -269,13 +268,8 @@
         self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bsc')))
         lib = self.inst.child('lib')
         self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }
-        self.proc = self.launch_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args)
-        try:
-            MainLoop.wait(self, self.proc.terminated)
-        except Exception as e:
-            self.proc.terminate()
-            raise e
-        return self.proc.result
+        self.proc = self.create_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args)
+        return self.proc.launch_sync(raise_nonsuccess=False)
 
     def set_unit_id(self, unitid, trx_num, restart=False):
         uid_str = '%d/0/%d' % (unitid, trx_num)

-- 
To view, visit https://gerrit.osmocom.org/11749
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: I986ba81d766240d4f11c079d90b126bf96d776b9
Gerrit-Change-Number: 11749
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
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/20181113/2d697ae7/attachment.htm>