util: use launch_sync API instead of manual wait
The API is available so no need to manually craft all steps in there.
Change-Id: I4afedb185f6e864929155981e8a2ec2df90110c3
diff --git a/src/osmo_gsm_tester/util.py b/src/osmo_gsm_tester/util.py
index e9a1f30..21653be 100644
--- a/src/osmo_gsm_tester/util.py
+++ b/src/osmo_gsm_tester/util.py
@@ -52,10 +52,7 @@
'''
from .process import Process
proc = Process('patchelf', run_dir, ['patchelf', '--set-rpath', paths, binary])
- proc.launch()
- proc.wait()
- if proc.result != 0:
- raise RuntimeError('patchelf finished with err code %d' % proc.result)
+ proc.launch_sync()
def ip_to_iface(ip):
try:
@@ -91,10 +88,7 @@
from .process import Process
SETCAP_NET_RAW_BIN = 'osmo-gsm-tester_setcap_net_raw.sh'
proc = Process(SETCAP_NET_RAW_BIN, run_dir, ['sudo', SETCAP_NET_RAW_BIN, binary])
- proc.launch()
- proc.wait()
- if proc.result != 0:
- raise RuntimeError('%s finished with err code %d' % (SETCAP_NET_RAW_BIN, proc.result))
+ proc.launch_sync()
def setcap_net_admin(binary, run_dir):
'''
@@ -104,10 +98,7 @@
from .process import Process
SETCAP_NET_ADMIN_BIN = 'osmo-gsm-tester_setcap_net_admin.sh'
proc = Process(SETCAP_NET_ADMIN_BIN, run_dir, ['sudo', SETCAP_NET_ADMIN_BIN, binary])
- proc.launch()
- proc.wait()
- if proc.result != 0:
- raise RuntimeError('%s finished with err code %d' % (SETCAP_NET_ADMIN_BIN, proc.result))
+ proc.launch_sync()
def import_path_prepend(pathname):
dir = os.path.realpath(pathname)