From 4dd712bd36a761c0db96dab0fe8d2ce422072ba0 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 28 May 2020 19:52:39 +0200 Subject: [PATCH] tests: Use bytes in a few places 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 --- 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 8ffa81895..2b691ff71 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 f033285a6..28123e853 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")