diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-01 01:05:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-01 01:05:46 +0000 |
| commit | de1fc8e95623f78392d414bdb66a53cf8a03d98e (patch) | |
| tree | fba46938811a0a460bdabbcb93014de6f8be1e5f | |
| parent | bc7dc8b076eb3cb4c73c4bf87434d1aa54299c70 (diff) | |
| parent | db259d46d3604a888b14e0424e11813b58a9187f (diff) | |
| download | platform_tools_test_connectivity-de1fc8e95623f78392d414bdb66a53cf8a03d98e.tar.gz platform_tools_test_connectivity-de1fc8e95623f78392d414bdb66a53cf8a03d98e.tar.bz2 platform_tools_test_connectivity-de1fc8e95623f78392d414bdb66a53cf8a03d98e.zip | |
Snap for 6449986 from db259d46d3604a888b14e0424e11813b58a9187f to rvc-release
Change-Id: I0b691379240898c13704ec08b451e651fe703499
| -rw-r--r-- | acts/tests/google/wifi/WifiCrashTest.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/acts/tests/google/wifi/WifiCrashTest.py b/acts/tests/google/wifi/WifiCrashTest.py index d43a0b9c0c..e6cbe2e86b 100644 --- a/acts/tests/google/wifi/WifiCrashTest.py +++ b/acts/tests/google/wifi/WifiCrashTest.py @@ -29,9 +29,8 @@ from acts.test_decorators import test_tracker_info from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest WifiEnums = wutils.WifiEnums -# Default timeout used for reboot, toggle WiFi and Airplane mode, -# for the system to settle down after the operation. -DEFAULT_TIMEOUT = 10 +# Timeout used for crash recovery. +RECOVERY_TIMEOUT = 15 WIFICOND_KILL_SHELL_COMMAND = "killall wificond" WIFI_VENDOR_HAL_KILL_SHELL_COMMAND = "killall android.hardware.wifi@1.0-service vendor.google.wifi_ext@1.0-service-vendor" SUPPLICANT_KILL_SHELL_COMMAND = "killall wpa_supplicant" @@ -100,7 +99,7 @@ class WifiCrashTest(WifiBaseTest): self.dut.restart_runtime() # We won't get the disconnect broadcast because framework crashed. # wutils.wait_for_disconnect(self.dut) - time.sleep(DEFAULT_TIMEOUT) + time.sleep(RECOVERY_TIMEOUT) wifi_info = self.dut.droid.wifiGetConnectionInfo() if wifi_info[WifiEnums.SSID_KEY] != self.network[WifiEnums.SSID_KEY]: raise signals.TestFailure("Device did not connect to the" @@ -123,7 +122,7 @@ class WifiCrashTest(WifiBaseTest): self.log.info("Crashing wificond") self.dut.adb.shell(WIFICOND_KILL_SHELL_COMMAND) wutils.wait_for_disconnect(self.dut) - time.sleep(DEFAULT_TIMEOUT) + time.sleep(RECOVERY_TIMEOUT) wifi_info = self.dut.droid.wifiGetConnectionInfo() if wifi_info[WifiEnums.SSID_KEY] != self.network[WifiEnums.SSID_KEY]: raise signals.TestFailure("Device did not connect to the" @@ -146,7 +145,7 @@ class WifiCrashTest(WifiBaseTest): self.log.info("Crashing wifi HAL") self.dut.adb.shell(WIFI_VENDOR_HAL_KILL_SHELL_COMMAND) wutils.wait_for_disconnect(self.dut) - time.sleep(DEFAULT_TIMEOUT) + time.sleep(RECOVERY_TIMEOUT) wifi_info = self.dut.droid.wifiGetConnectionInfo() if wifi_info[WifiEnums.SSID_KEY] != self.network[WifiEnums.SSID_KEY]: raise signals.TestFailure("Device did not connect to the" @@ -169,7 +168,7 @@ class WifiCrashTest(WifiBaseTest): self.log.info("Crashing wpa_supplicant") self.dut.adb.shell(SUPPLICANT_KILL_SHELL_COMMAND) wutils.wait_for_disconnect(self.dut) - time.sleep(DEFAULT_TIMEOUT) + time.sleep(RECOVERY_TIMEOUT) wifi_info = self.dut.droid.wifiGetConnectionInfo() if wifi_info[WifiEnums.SSID_KEY] != self.network[WifiEnums.SSID_KEY]: raise signals.TestFailure("Device did not connect to the" |