Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-29 05:39:24 +01:00
Code Releases Activity

auto-t: hostapd.py: remove _hostapd_restarted concept

Browse Source 
The destructor was trying to do more than the scope of a destructor
by trying to handle this single case of hostapd being restarted.

Instead we can simply pass a keyword argument 'reinit' to the
constructor to tell it to reinitialize everything. And as for killing
hostapd this can be done in ungraceful_restart itself rather than
trying to handle it in the destructor.
This commit is contained in:
James Prestwood 2021-08-16 09:04:50 -07:00 committed by Denis Kenzior
parent 7b98a6ed9c
commit 42fe6c5a15
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
autotests/util/hostapd.py
View File

@ -43,10 +43,10 @@ class HostapdCLI(object):
return cls._instances[config] return cls._instances[config]
def _init_hostapd(self, config): def _init_hostapd(self, config, reinit=False):
global ctrl_count global ctrl_count
if self._initialized: if self._initialized and not reinit:
return return
self._initialized = True self._initialized = True
@ -60,9 +60,6 @@ class HostapdCLI(object):
hapd = ctx.hostapd[config] hapd = ctx.hostapd[config]
if not hasattr(self, '_hostapd_restarted'):
self._hostapd_restarted = False
self.interface = hapd.intf self.interface = hapd.intf
self.config = hapd.config self.config = hapd.config
@ -131,12 +128,6 @@ class HostapdCLI(object):
except: except:
pass pass
if self._hostapd_restarted:
ctx.stop_process(ctx.hostapd.process, force)
self.interface.set_interface_state('down')
self.interface.set_interface_state('up')
def __del__(self): def __del__(self):
self._del_hostapd() self._del_hostapd()
@ -215,8 +206,10 @@ class HostapdCLI(object):
''' '''
Ungracefully kill and restart hostapd Ungracefully kill and restart hostapd
''' '''
# set flag so hostapd can be killed after the test ctx.stop_process(ctx.hostapd.process, True)
self._hostapd_restarted = True
self.interface.set_interface_state('down')
self.interface.set_interface_state('up')
self._del_hostapd(force=True) self._del_hostapd(force=True)
@ -226,7 +219,7 @@ class HostapdCLI(object):
time.sleep(1) time.sleep(1)
# New hostapd process, so re-init # New hostapd process, so re-init
self._init_hostapd(config=self.config) self._init_hostapd(config=self.config, reinit=True)
def req_beacon(self, addr, request): def req_beacon(self, addr, request):
''' '''