tests: Fix WEXT testing
authorJouni Malinen <j@w1.fi>
Sat, 14 May 2016 15:59:47 +0000 (18:59 +0300)
committerJouni Malinen <j@w1.fi>
Sat, 14 May 2016 15:59:47 +0000 (18:59 +0300)
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 <j@w1.fi>
tests/hwsim/wpasupplicant.py

index eba1bb0..f26124d 100644 (file)
@@ -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