From 0e72ce886144dc1ef5b3b0bc90d0a837f82afbe0 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Thu, 8 Sep 2022 15:33:07 -0700 Subject: [PATCH] auto-t: add more checks to testRRM The hostapd events for RRM come regardless of success so they need to be checked as such. In addition one more RRM request was added to scan on a frequency which is disabled (operating class 82, channel 14). --- autotests/testRRM/connection_test.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/autotests/testRRM/connection_test.py b/autotests/testRRM/connection_test.py index 4d894958..508d7119 100644 --- a/autotests/testRRM/connection_test.py +++ b/autotests/testRRM/connection_test.py @@ -21,6 +21,8 @@ beacon_passive = '510b0000000000ffffffffffff020100' beacon_active = '510b0000000001ffffffffffff020100' # Passive beacon with duration set beacon_passive_duration = '510b0000c80000ffffffffffff020100' +# Passive beacon on disabled frequency (disallowed in US) +beacon_passive_disabled = '520e0000c80000ffffffffffff020100' class Test(unittest.TestCase): @@ -57,13 +59,15 @@ class Test(unittest.TestCase): hapd.req_beacon(device.address, basic_beacon) for e in ['BEACON-RESP-RX', 'BEACON-RESP-RX']: - hapd.wait_for_event(e) + event = hapd.wait_for_event(e).split(' ') + self.assertTrue(event[3] == '00') wd.wait(1) # This should return just ssidRRM hapd.req_beacon(device.address, beacon_with_ssid) - hapd.wait_for_event('BEACON-RESP-RX') + event = hapd.wait_for_event('BEACON-RESP-RX').split(' ') + self.assertTrue(event[3] == '00') wd.wait(1) @@ -71,7 +75,8 @@ class Test(unittest.TestCase): hapd.req_beacon(device.address, beacon_passive) # TODO: See if we are scanning here (scan not initiated from station) - hapd.wait_for_event('BEACON-RESP-RX') + event = hapd.wait_for_event('BEACON-RESP-RX').split(' ') + self.assertTrue(event[3] == '00') wd.wait(1) @@ -79,7 +84,8 @@ class Test(unittest.TestCase): hapd.req_beacon(device.address, beacon_active) # TODO: See if we are scanning here (scan not initiated from station) - hapd.wait_for_event('BEACON-RESP-RX') + event = hapd.wait_for_event('BEACON-RESP-RX').split(' ') + self.assertTrue(event[3] == '00') wd.wait(1) @@ -87,7 +93,15 @@ class Test(unittest.TestCase): hapd.req_beacon(device.address, beacon_passive_duration) # TODO: See if we are scanning here (scan not initiated from station) - hapd.wait_for_event('BEACON-RESP-RX') + event = hapd.wait_for_event('BEACON-RESP-RX').split(' ') + self.assertTrue(event[3] == '00') + + wd.wait(1) + + hapd.req_beacon(device.address, beacon_passive_disabled) + + event = hapd.wait_for_event('BEACON-RESP-RX').split(' ') + self.assertTrue(event[3] != '00') device.disconnect()