From fe0879f7d1a73f74dce18f8fdc31f69f0874e2e7 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Thu, 17 Dec 2020 11:36:07 -0800 Subject: [PATCH] test-runner: start hwsim always (optionally --no-register) Always start hwsim but if tests do not need radio rules start with the --no-register option. --- tools/test-runner | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/test-runner b/tools/test-runner index d16c8885..16628399 100755 --- a/tools/test-runner +++ b/tools/test-runner @@ -675,6 +675,14 @@ class TestContext(Namespace): def create_radios(self): setup = self.hw_config['SETUP'] nradios = int(setup['num_radios']) + args = ['hwsim'] + + if not self.hw_config['SETUP'].get('hwsim_medium', 'yes') in ['yes', '1', 'true']: + # register hwsim as medium + args.extend(['--no-register']) + + self.start_process(args) + self.wait_for_dbus_service('net.connman.hwsim') for i in range(nradios): name = 'rad%u' % i @@ -690,10 +698,6 @@ class TestContext(Namespace): self.radios.append(VirtualRadio(name, rad_config)) self.cur_radio_id += 1 - if self.hw_config['SETUP'].get('hwsim_medium', 'yes') in ['yes', '1', 'true']: - # register hwsim as medium - self.start_process(['hwsim']) - def discover_radios(self): phys = [] iw = pyroute2.iwutil.IW()