From c45b969d6a6855b5ef809cf0ac5c35b41866f75a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 3 Feb 2019 12:44:17 +0200 Subject: [PATCH] tests: python3 compatible str/bytes ord() Need to skip ord() for python3 when going through bytes object (instead of str object in python2). Signed-off-by: Jouni Malinen --- tests/hwsim/test_wpas_wmm_ac.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/hwsim/test_wpas_wmm_ac.py b/tests/hwsim/test_wpas_wmm_ac.py index 94c540b24..6a3ee807f 100644 --- a/tests/hwsim/test_wpas_wmm_ac.py +++ b/tests/hwsim/test_wpas_wmm_ac.py @@ -8,6 +8,7 @@ from remotehost import remote_compatible import logging logger = logging.getLogger() import struct +import sys import hwsim_utils import hostapd @@ -201,7 +202,8 @@ def test_tspec_protocol(dev, apdev): msg['sa'] = apdev[0]['bssid'] # modified parameters - msg['payload'] = struct.pack('BBBB', 17, 1, dialog, 1) + payload[4:12] + struct.pack('B', ord(payload[12]) & ~0x60) + payload[13:] + p12int = payload[12] if sys.version_info[0] > 2 else ord(payload[12]) + msg['payload'] = struct.pack('BBBB', 17, 1, dialog, 1) + payload[4:12] + struct.pack('B', p12int & ~0x60) + payload[13:] hapd.mgmt_tx(msg) # reject request