[PATCH] tests: use bytes in a few places
Johannes Berg <[email protected]> Thu, 28 May 2020 19:52:39 +0200
| Newsgroups | gmane.linux.drivers.hostap |
|---|---|
| Message-ID | <1590688359-I1f19fb84f7f49d6efd67e183f2b22a46c50e7e44@changeid> |
From: Johannes Berg <[email protected]> With python3 bytes are returned for stdout, so need to use b'' strings instead of normal strings. These are just a few places I ran into, almost certainly more places need it. Signed-off-by: Johannes Berg <[email protected]> --- tests/hwsim/test_ap_vht.py | 2 +- tests/hwsim/test_he.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_ap_vht.py b/tests/hwsim/test_ap_vht.py index 8ffa8189593d..2b691ff71025 100644 --- a/tests/hwsim/test_ap_vht.py +++ b/tests/hwsim/test_ap_vht.py @@ -553,7 +553,7 @@ def run_ap_vht160_no_dfs(dev, apdev, channel, ht_capab): cmd = subprocess.Popen(["iw", "reg", "get"], stdout=subprocess.PIPE) reg = cmd.stdout.readlines() for r in reg: - if "5490" in r and "DFS" in r: + if b"5490" in r and b"DFS" in r: raise HwsimSkip("ZA regulatory rule did not have DFS requirement removed") raise Exception("AP setup timed out") diff --git a/tests/hwsim/test_he.py b/tests/hwsim/test_he.py index f033285a6201..28123e853ca1 100644 --- a/tests/hwsim/test_he.py +++ b/tests/hwsim/test_he.py @@ -623,7 +623,7 @@ def run_ap_he160_no_dfs(dev, apdev, channel, ht_capab): cmd = subprocess.Popen(["iw", "reg", "get"], stdout=subprocess.PIPE) reg = cmd.stdout.readlines() for r in reg: - if "5490" in r and "DFS" in r: + if b"5490" in r and b"DFS" in r: raise HwsimSkip("ZA regulatory rule did not have DFS requirement removed") raise Exception("AP setup timed out") -- 2.26.2