From: Jouni Malinen Date: Thu, 18 Dec 2014 14:00:25 +0000 (+0200) Subject: tests: Allow dump_monitor() to be used without global monitor interface X-Git-Tag: hostap_2_4~762 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8836a4f037d778be02b41a81635c594bca87604;p=thirdparty%2Fhostap.git tests: Allow dump_monitor() to be used without global monitor interface It is possible for WpaSupplicant instance to be used without the global control socket, so allow dump_monitor() to handle this case cleanly. Signed-off-by: Jouni Malinen --- diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index d3a9e804d..38217d008 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -30,6 +30,8 @@ class WpaSupplicant: self.global_ctrl = wpaspy.Ctrl(global_iface) self.global_mon = wpaspy.Ctrl(global_iface) self.global_mon.attach() + else: + self.global_mon = None def set_ifname(self, ifname): self.ifname = ifname @@ -641,7 +643,7 @@ class WpaSupplicant: while self.mon.pending(): ev = self.mon.recv() logger.debug(self.ifname + ": " + ev) - while self.global_mon.pending(): + while self.global_mon and self.global_mon.pending(): ev = self.global_mon.recv() logger.debug(self.ifname + "(global): " + ev)