From d1fb06c9479b30c0aa0943ff330f8571167371c9 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 7 Aug 2019 12:41:12 +0300 Subject: [PATCH] tests: Check wait_event argument type It was clearly too easy to get unexpected behavior by accidentially passing in a string instead of a list of strings to these functions, so enforce the correct type to notice such issues automatically. Signed-off-by: Jouni Malinen --- tests/hwsim/hostapd.py | 2 ++ tests/hwsim/wpasupplicant.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index a0b8cac18..4430d8055 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -246,6 +246,8 @@ class Hostapd: logger.debug(self.dbg + ": " + ev) def wait_event(self, events, timeout): + if not isinstance(events, list): + raise Exception("Hostapd.wait_event() called with incorrect events argument type") start = os.times()[4] while True: while self.mon.pending(): diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index be1963704..8c7e13d02 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -838,6 +838,8 @@ class WpaSupplicant: raise Exception("P2P_CONNECT failed") def _wait_event(self, mon, pfx, events, timeout): + if not isinstance(events, list): + raise Exception("WpaSupplicant._wait_event() called with incorrect events argument type") start = os.times()[4] while True: while mon.pending(): @@ -864,6 +866,8 @@ class WpaSupplicant: events, timeout) def wait_group_event(self, events, timeout=10): + if not isinstance(events, list): + raise Exception("WpaSupplicant.wait_group_event() called with incorrect events argument type") if self.group_ifname and self.group_ifname != self.ifname: if self.gctrl_mon is None: return None