diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-08 03:11:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-08 03:11:55 +0000 |
| commit | c8cb6aba4b7570b8d4a779b9a4fb4b283ad0c5e8 (patch) | |
| tree | 72ee7bf17020c40d98eddba67b37fb09e50931ca | |
| parent | efeecdf7d742396b99c91eddeae84e00ed16216c (diff) | |
| parent | 7b87474cd6ae181a28065dee1f5327f2ebda935d (diff) | |
| download | platform_tools_test_connectivity-android11-mainline-release.tar.gz platform_tools_test_connectivity-android11-mainline-release.tar.bz2 platform_tools_test_connectivity-android11-mainline-release.zip | |
Snap for 6660892 from 7b87474cd6ae181a28065dee1f5327f2ebda935d to mainline-releaseandroid-mainline-11.0.0_r1android11-mainline-release
Change-Id: I10e00d3a7aa21267845a2cfd50f0ae25c215d5d3
4 files changed, 12 insertions, 7 deletions
diff --git a/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_const.py b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_const.py index 6e0c95779d..87f405967e 100644 --- a/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_const.py +++ b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_const.py @@ -28,6 +28,7 @@ DEFAULT_TIMEOUT = 30 DEFAULT_SLEEPTIME = 5 DEFAULT_FUNCTION_SWITCH_TIME = 10 DEFAULT_SERVICE_WAITING_TIME = 20 +DEFAULT_GROUP_CLIENT_LOST_TIME = 60 P2P_CONNECT_NEGOTIATION = 0 P2P_CONNECT_JOIN = 1 diff --git a/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py index 2e94f48f4c..abd186f0d3 100755 --- a/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py +++ b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py @@ -43,7 +43,7 @@ def is_discovered(event, ad): return False -def check_disconnect(ad): +def check_disconnect(ad, timeout=p2pconsts.DEFAULT_TIMEOUT): """Check an Android device disconnect or not Args: @@ -51,7 +51,7 @@ def check_disconnect(ad): """ ad.droid.wifiP2pRequestConnectionInfo() # wait disconnect event - ad.ed.pop_event(p2pconsts.DISCONNECTED_EVENT, p2pconsts.DEFAULT_TIMEOUT) + ad.ed.pop_event(p2pconsts.DISCONNECTED_EVENT, timeout) def p2p_disconnect(ad): diff --git a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py index 04f02184c4..ba37b4e2cc 100644 --- a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py +++ b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py @@ -66,8 +66,9 @@ class WifiNetworkSuggestionTest(WifiBaseTest): self.dut = self.android_devices[0] wutils.wifi_test_device_init(self.dut) opt_param = [ - "radius_conf_2g", "radius_conf_5g", "ca_cert", "eap_identity", - "eap_password", "passpoint_networks", "altsubject_match" ] + "open_network", "reference_networks", "hidden_networks", "radius_conf_2g", + "radius_conf_5g", "ca_cert", "eap_identity", "eap_password", "passpoint_networks", + "altsubject_match"] self.unpack_userparams(opt_param_names=opt_param,) if "AccessPoint" in self.user_params: diff --git a/acts/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py b/acts/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py index 1b941e2852..6bda400dd6 100644 --- a/acts/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py +++ b/acts/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py @@ -100,7 +100,8 @@ class WifiP2pManagerTest(WifiP2pBaseTest): gc_dut.ed.clear_all_events() wp2putils.p2p_connect(gc_dut, go_dut, True, WPS_PBC) wp2putils.p2p_disconnect(gc_dut) - wp2putils.check_disconnect(go_dut) + wp2putils.check_disconnect( + go_dut, timeout=p2pconsts.DEFAULT_GROUP_CLIENT_LOST_TIME) time.sleep(p2pconsts.DEFAULT_FUNCTION_SWITCH_TIME) @test_tracker_info(uuid="12bbe73a-5a6c-4307-9797-c77c7efdc4b5") @@ -150,7 +151,8 @@ class WifiP2pManagerTest(WifiP2pBaseTest): gc_dut.ed.clear_all_events() wp2putils.p2p_connect(gc_dut, go_dut, True, WPS_DISPLAY) wp2putils.p2p_disconnect(gc_dut) - wp2putils.check_disconnect(go_dut) + wp2putils.check_disconnect( + go_dut, timeout=p2pconsts.DEFAULT_GROUP_CLIENT_LOST_TIME) time.sleep(p2pconsts.DEFAULT_FUNCTION_SWITCH_TIME) @test_tracker_info(uuid="efe88f57-5a08-4195-9592-2f6945a9d18a") @@ -200,5 +202,6 @@ class WifiP2pManagerTest(WifiP2pBaseTest): gc_dut.ed.clear_all_events() wp2putils.p2p_connect(gc_dut, go_dut, True, WPS_KEYPAD) wp2putils.p2p_disconnect(gc_dut) - wp2putils.check_disconnect(go_dut) + wp2putils.check_disconnect( + go_dut, timeout=p2pconsts.DEFAULT_GROUP_CLIENT_LOST_TIME) time.sleep(p2pconsts.DEFAULT_FUNCTION_SWITCH_TIME) |