From 1444f55643a9c4f821eeba1b57aee76b0fcfa699 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 12 Nov 2018 18:23:34 +0100 Subject: nanobts: ipacces-config: Use process.launch_sync helper Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 --- src/osmo_gsm_tester/bts_nanobts.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src') 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 @@ class IpAccessConfig(log.Origin): 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 @@ class IpAccessConfig(log.Origin): 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 @@ class IpAccessConfig(log.Origin): 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) -- cgit v1.2.3