[PATCH v2 29/38] tests: Modify rrm test sets for python3

[Masashi Honma <masashi.honma@xxxxxxxxx>]

Signed-off-by: Masashi Honma <masashi.honma@xxxxxxxxx>
---
 tests/hwsim/test_rrm.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/hwsim/test_rrm.py b/tests/hwsim/test_rrm.py
index 35de1850c..882b434a0 100644
--- a/tests/hwsim/test_rrm.py
+++ b/tests/hwsim/test_rrm.py
@@ -729,11 +729,11 @@ class BeaconReport:
     def __str__(self):
         txt = "opclass={} channel={} start={} duration={} frame_info={} rcpi={} rsni={} bssid={} antenna_id={} parent_tsf={}".format(self.opclass, self.channel, self.start, self.duration, self.frame_info, self.rcpi, self.rsni, self.bssid_str, self.antenna_id, self.parent_tsf)
         if self.frame_body:
-            txt += " frame_body=" + binascii.hexlify(self.frame_body)
+            txt += " frame_body=" + binascii.hexlify(self.frame_body).decode()
         if self.frame_body_fragment_id:
-            txt += " fragment_id=" + binascii.hexlify(self.frame_body_fragment_id)
+            txt += " fragment_id=" + binascii.hexlify(self.frame_body_fragment_id).decode()
         if self.last_indication:
-            txt += " last_indication=" + binascii.hexlify(self.last_indication)
+            txt += " last_indication=" + binascii.hexlify(self.last_indication).decode()
 
         return txt
 
@@ -874,7 +874,7 @@ def test_rrm_beacon_req_last_frame_indication(dev, apdev):
         if not report.last_indication:
             raise Exception("Last Beacon Report Indication subelement missing")
 
-        last = binascii.hexlify(report.last_indication)
+        last = binascii.hexlify(report.last_indication).decode()
         if last != '01':
             raise Exception("last beacon report indication is not set on last frame")
 
@@ -1083,7 +1083,7 @@ def test_rrm_beacon_req_table_ssid(dev, apdev):
     addr = dev[0].own_addr()
 
     bssid2 = hapd2.own_addr()
-    token = run_req_beacon(hapd, addr, "51000000000002ffffffffffff" + "0007" + "another".encode('hex'))
+    token = run_req_beacon(hapd, addr, "51000000000002ffffffffffff" + "0007" + binascii.hexlify(b"another").decode())
     ev = hapd.wait_event(["BEACON-RESP-RX"], timeout=10)
     if ev is None:
         raise Exception("Beacon report response not received")
-- 
2.17.1


_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap