tests: Remove trailing whitespace
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
82358a2a63
commit
db98b58736
8 changed files with 11 additions and 11 deletions
|
@ -163,7 +163,7 @@ class Connection(object):
|
||||||
contents = self.descriptor.recv(16384)
|
contents = self.descriptor.recv(16384)
|
||||||
# XXX: python doesn't give us message flags, check
|
# XXX: python doesn't give us message flags, check
|
||||||
# len(contents) vs. msglen for TRUNC
|
# len(contents) vs. msglen for TRUNC
|
||||||
msglen, msg_type, flags, seq, pid = struct.unpack("IHHII",
|
msglen, msg_type, flags, seq, pid = struct.unpack("IHHII",
|
||||||
contents[:16])
|
contents[:16])
|
||||||
msg = Message(msg_type, flags, seq, contents[16:])
|
msg = Message(msg_type, flags, seq, contents[16:])
|
||||||
msg.pid = pid
|
msg.pid = pid
|
||||||
|
|
|
@ -84,7 +84,7 @@ class RFKill(object):
|
||||||
@property
|
@property
|
||||||
def soft_blocked(self):
|
def soft_blocked(self):
|
||||||
return self.blocked[0]
|
return self.blocked[0]
|
||||||
|
|
||||||
@soft_blocked.setter
|
@soft_blocked.setter
|
||||||
def soft_blocked(self, block):
|
def soft_blocked(self, block):
|
||||||
if block:
|
if block:
|
||||||
|
|
|
@ -2039,7 +2039,7 @@ def test_ap_wpa2_eap_tls_diff_ca_trust(dev, apdev):
|
||||||
ev = dev[0].wait_event(["CTRL-EVENT-EAP-PROPOSED-METHOD vendor=0 method=21"], timeout=15)
|
ev = dev[0].wait_event(["CTRL-EVENT-EAP-PROPOSED-METHOD vendor=0 method=21"], timeout=15)
|
||||||
if ev is None:
|
if ev is None:
|
||||||
raise Exception("EAP-TTLS not re-started")
|
raise Exception("EAP-TTLS not re-started")
|
||||||
|
|
||||||
ev = dev[0].wait_disconnected(timeout=15)
|
ev = dev[0].wait_disconnected(timeout=15)
|
||||||
if "reason=23" not in ev:
|
if "reason=23" not in ev:
|
||||||
raise Exception("Proper reason code for disconnection not reported")
|
raise Exception("Proper reason code for disconnection not reported")
|
||||||
|
@ -2066,7 +2066,7 @@ def test_ap_wpa2_eap_tls_diff_ca_trust2(dev, apdev):
|
||||||
ev = dev[0].wait_event(["CTRL-EVENT-EAP-PROPOSED-METHOD vendor=0 method=21"], timeout=15)
|
ev = dev[0].wait_event(["CTRL-EVENT-EAP-PROPOSED-METHOD vendor=0 method=21"], timeout=15)
|
||||||
if ev is None:
|
if ev is None:
|
||||||
raise Exception("EAP-TTLS not re-started")
|
raise Exception("EAP-TTLS not re-started")
|
||||||
|
|
||||||
ev = dev[0].wait_disconnected(timeout=15)
|
ev = dev[0].wait_disconnected(timeout=15)
|
||||||
if "reason=23" not in ev:
|
if "reason=23" not in ev:
|
||||||
raise Exception("Proper reason code for disconnection not reported")
|
raise Exception("Proper reason code for disconnection not reported")
|
||||||
|
@ -2089,7 +2089,7 @@ def test_ap_wpa2_eap_tls_diff_ca_trust3(dev, apdev):
|
||||||
ev = dev[0].wait_event(["CTRL-EVENT-EAP-PROPOSED-METHOD vendor=0 method=21"], timeout=15)
|
ev = dev[0].wait_event(["CTRL-EVENT-EAP-PROPOSED-METHOD vendor=0 method=21"], timeout=15)
|
||||||
if ev is None:
|
if ev is None:
|
||||||
raise Exception("EAP-TTLS not re-started")
|
raise Exception("EAP-TTLS not re-started")
|
||||||
|
|
||||||
ev = dev[0].wait_disconnected(timeout=15)
|
ev = dev[0].wait_disconnected(timeout=15)
|
||||||
if "reason=23" not in ev:
|
if "reason=23" not in ev:
|
||||||
raise Exception("Proper reason code for disconnection not reported")
|
raise Exception("Proper reason code for disconnection not reported")
|
||||||
|
|
|
@ -53,7 +53,7 @@ def _test_ap_track_sta(dev, apdev):
|
||||||
raise Exception("Station missing from 2.4 GHz tracking")
|
raise Exception("Station missing from 2.4 GHz tracking")
|
||||||
if addr2 in track:
|
if addr2 in track:
|
||||||
raise Exception("Unexpected station included in 2.4 GHz tracking")
|
raise Exception("Unexpected station included in 2.4 GHz tracking")
|
||||||
|
|
||||||
track = hapd2.request("TRACK_STA_LIST")
|
track = hapd2.request("TRACK_STA_LIST")
|
||||||
if addr0 not in track or addr2 not in track:
|
if addr0 not in track or addr2 not in track:
|
||||||
raise Exception("Station missing from 5 GHz tracking")
|
raise Exception("Station missing from 5 GHz tracking")
|
||||||
|
|
|
@ -6271,7 +6271,7 @@ def decrypt_attr_encr_settings(authkey, keywrapkey, data):
|
||||||
for i in range(-pad_len, -1):
|
for i in range(-pad_len, -1):
|
||||||
if decrypted[i] != decrypted[-1]:
|
if decrypted[i] != decrypted[-1]:
|
||||||
raise Exception("Invalid PS value in Encrypted Settings")
|
raise Exception("Invalid PS value in Encrypted Settings")
|
||||||
|
|
||||||
decrypted = decrypted[0:len(decrypted) - pad_len]
|
decrypted = decrypted[0:len(decrypted) - pad_len]
|
||||||
if len(decrypted) < 12:
|
if len(decrypted) < 12:
|
||||||
raise Exception("Truncated Encrypted Settings plaintext")
|
raise Exception("Truncated Encrypted Settings plaintext")
|
||||||
|
|
|
@ -2975,7 +2975,7 @@ def test_dbus_p2p_service_discovery(dev, apdev):
|
||||||
|
|
||||||
bonjour_query = dbus.ByteArray(binascii.unhexlify('0b5f6166706f766572746370c00c000c01'))
|
bonjour_query = dbus.ByteArray(binascii.unhexlify('0b5f6166706f766572746370c00c000c01'))
|
||||||
bonjour_response = dbus.ByteArray(binascii.unhexlify('074578616d706c65c027'))
|
bonjour_response = dbus.ByteArray(binascii.unhexlify('074578616d706c65c027'))
|
||||||
|
|
||||||
args = { 'service_type': 'bonjour',
|
args = { 'service_type': 'bonjour',
|
||||||
'query': bonjour_query,
|
'query': bonjour_query,
|
||||||
'response': bonjour_response }
|
'response': bonjour_response }
|
||||||
|
|
|
@ -5585,7 +5585,7 @@ def test_eap_proto_mschapv2(dev, apdev):
|
||||||
|
|
||||||
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
|
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
|
||||||
logger.info("auth_challenge: " + auth_challenge.encode("hex"))
|
logger.info("auth_challenge: " + auth_challenge.encode("hex"))
|
||||||
|
|
||||||
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
|
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
|
||||||
peer_challenge,
|
peer_challenge,
|
||||||
auth_challenge, "user")
|
auth_challenge, "user")
|
||||||
|
@ -5633,7 +5633,7 @@ def test_eap_proto_mschapv2(dev, apdev):
|
||||||
|
|
||||||
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
|
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
|
||||||
logger.info("auth_challenge: " + auth_challenge.encode("hex"))
|
logger.info("auth_challenge: " + auth_challenge.encode("hex"))
|
||||||
|
|
||||||
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
|
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
|
||||||
peer_challenge,
|
peer_challenge,
|
||||||
auth_challenge, "user")
|
auth_challenge, "user")
|
||||||
|
|
|
@ -767,7 +767,7 @@ def p2ps_connect_p2ps_method(dev, keep_group=False, join_extra="", flush=True):
|
||||||
res = dev[1].group_form_result(go_ev)
|
res = dev[1].group_form_result(go_ev)
|
||||||
if join_extra == "":
|
if join_extra == "":
|
||||||
join_extra = " freq=" + res['freq']
|
join_extra = " freq=" + res['freq']
|
||||||
|
|
||||||
ifnames = get_ifnames()
|
ifnames = get_ifnames()
|
||||||
p2ps_connect_pd(dev[0], dev[1], ev0, ev1, join_extra=join_extra,
|
p2ps_connect_pd(dev[0], dev[1], ev0, ev1, join_extra=join_extra,
|
||||||
go_ev=go_ev)
|
go_ev=go_ev)
|
||||||
|
|
Loading…
Reference in a new issue