From 50d06776c6c638121e9630ef9cde7a477b04563d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 14 May 2016 18:59:47 +0300 Subject: [PATCH] tests: Fix WEXT testing Commit afb2e8b8913f131e5fb3a1031aacae3ab2b91287 ('tests: Store P2P Device ifname in class WpaSupplicant') did not take into account the possibility of capa.flags not existing in get_driver_status() and broke WEXT test cases. Fix this by checking that capa.flags is present before looking at its value. Signed-off-by: Jouni Malinen --- tests/hwsim/wpasupplicant.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index eba1bb0e5..f26124d24 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -26,7 +26,7 @@ class WpaSupplicant: if ifname: self.set_ifname(ifname, hostname, port) res = self.get_driver_status() - if int(res['capa.flags'], 0) & 0x20000000: + if 'capa.flags' in res and int(res['capa.flags'], 0) & 0x20000000: self.p2p_dev_ifname = 'p2p-dev-' + self.ifname else: self.p2p_dev_ifname = ifname @@ -135,7 +135,7 @@ class WpaSupplicant: port = self.get_ctrl_iface_port(ifname) self.set_ifname(ifname, self.hostname, port) res = self.get_driver_status() - if int(res['capa.flags'], 0) & 0x20000000: + if 'capa.flags' in res and int(res['capa.flags'], 0) & 0x20000000: self.p2p_dev_ifname = 'p2p-dev-' + self.ifname else: self.p2p_dev_ifname = ifname