diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 01:12:17 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 01:12:17 +0000 |
| commit | 02e27f1b71a7e72cf2b20302c2bddaef97a12af0 (patch) | |
| tree | e0dae17734dcc75e68c90a320f9e07d50cf8966e | |
| parent | e5f020a16ee99871a3b8ad64d585ee3e9cdaf107 (diff) | |
| parent | 40f5d7ba23635e00ef5b33ee8019af10aae939c2 (diff) | |
| download | platform_tools_test_connectivity-02e27f1b71a7e72cf2b20302c2bddaef97a12af0.tar.gz platform_tools_test_connectivity-02e27f1b71a7e72cf2b20302c2bddaef97a12af0.tar.bz2 platform_tools_test_connectivity-02e27f1b71a7e72cf2b20302c2bddaef97a12af0.zip | |
Snap for 6516174 from 40f5d7ba23635e00ef5b33ee8019af10aae939c2 to rvc-release
Change-Id: I32ca2bcdc3027a6fad3850edb2a2acaf4fd9e730
| -rw-r--r-- | acts/tests/google/wifi/aware/functional/DataPathTest.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/acts/tests/google/wifi/aware/functional/DataPathTest.py b/acts/tests/google/wifi/aware/functional/DataPathTest.py index bc7dd43698..d966722eda 100644 --- a/acts/tests/google/wifi/aware/functional/DataPathTest.py +++ b/acts/tests/google/wifi/aware/functional/DataPathTest.py @@ -597,15 +597,22 @@ class DataPathTest(AwareBaseTest): # Initiator & Responder: # - expect unavailable on the Initiator party if the - # Initiator or Responder has a bad ID - # - but a Responder will keep waiting ... + # Initiator and Responder with mac or encryption mismatch + # - For responder: + # - If mac mismatch, responder will keep waiting ... + # - If encryption mismatch, responder expect unavailable autils.wait_for_event_with_keys( init_dut, cconsts.EVENT_NETWORK_CALLBACK, autils.EVENT_NDP_TIMEOUT, (cconsts.NETWORK_CB_KEY_EVENT, cconsts.NETWORK_CB_UNAVAILABLE)) time.sleep(autils.EVENT_NDP_TIMEOUT) - autils.fail_on_event_with_keys( - resp_dut, cconsts.EVENT_NETWORK_CALLBACK, 0, - (cconsts.NETWORK_CB_KEY_ID, init_req_key)) + if init_mismatch_mac or resp_mismatch_mac: + autils.fail_on_event_with_keys( + resp_dut, cconsts.EVENT_NETWORK_CALLBACK, 0, + (cconsts.NETWORK_CB_KEY_ID, resp_req_key)) + else: + autils.wait_for_event_with_keys( + resp_dut, cconsts.EVENT_NETWORK_CALLBACK, autils.EVENT_NDP_TIMEOUT, + (cconsts.NETWORK_CB_KEY_EVENT, cconsts.NETWORK_CB_UNAVAILABLE)) # clean-up resp_dut.droid.connectivityUnregisterNetworkCallback(resp_req_key) |