From c2149b08dac100a22bb36f0e3d15a113aad0451f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 12 Mar 2014 11:42:59 +0200 Subject: [PATCH] tests: Wait longer for hostapd REMOVE command to complete Some kernel debugging options (especially CONFIG_DEBUG_KOBJECT_RELEASE=y) can add significant blocking time to interface removal with NL80211_CMD_DEL_INTERFACE and SIOCGIFBR(BRCTL_DEL_BRIDGE) block for 1-8 seconds. This could result in the VLAN test cases failing due to a wpaspy timeout on the REMOVE command even though the issue was only in the kernel debugging code making the operations significantly slower. Work around this by using a longer timeout for that control interface command to allow this type of debug kernel to be used. Signed-off-by: Jouni Malinen --- tests/hwsim/hostapd.py | 2 +- wpaspy/wpaspy.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index c6d8a746f..984e4cc86 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -39,7 +39,7 @@ class HostapdGlobal: raise Exception("Could not add hostapd BSS") def remove(self, ifname): - self.ctrl.request("REMOVE " + ifname) + self.ctrl.request("REMOVE " + ifname, timeout=30) def relog(self): self.ctrl.request("RELOG") diff --git a/wpaspy/wpaspy.py b/wpaspy/wpaspy.py index 24c371908..94943053f 100644 --- a/wpaspy/wpaspy.py +++ b/wpaspy/wpaspy.py @@ -45,9 +45,9 @@ class Ctrl: os.unlink(self.local) self.started = False - def request(self, cmd): + def request(self, cmd, timeout=10): self.s.send(cmd) - [r, w, e] = select.select([self.s], [], [], 10) + [r, w, e] = select.select([self.s], [], [], timeout) if r: return self.s.recv(4096) raise Exception("Timeout on waiting response")