summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-12-19 02:17:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-12-19 02:17:36 +0000
commit2be7b7d4a536b32b4d2c882b80283e9c3b1bf36d (patch)
treeb1be832918dcdb486c3b08374e826d745f58cda2
parent1713b5e25c4389e09a013ae26da19798c52d0783 (diff)
parentba13ed6b055e329159cc0f9d23e3d64fdbea4b3d (diff)
downloadplatform_tools_test_connectivity-2be7b7d4a536b32b4d2c882b80283e9c3b1bf36d.tar.gz
platform_tools_test_connectivity-2be7b7d4a536b32b4d2c882b80283e9c3b1bf36d.tar.bz2
platform_tools_test_connectivity-2be7b7d4a536b32b4d2c882b80283e9c3b1bf36d.zip
Merge "DO NOT MERGE: Forget networks before wifi firmware crash" into pi-dev
-rwxr-xr-xacts/tests/google/wifi/WifiCrashStressTest.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/acts/tests/google/wifi/WifiCrashStressTest.py b/acts/tests/google/wifi/WifiCrashStressTest.py
index ae0def9acf..6668f14059 100755
--- a/acts/tests/google/wifi/WifiCrashStressTest.py
+++ b/acts/tests/google/wifi/WifiCrashStressTest.py
@@ -85,7 +85,7 @@ class WifiCrashStressTest(WifiBaseTest):
del self.user_params["reference_networks"]
"""Helper Functions"""
- def trigger_wifi_firmware_crash(self, ad, timeout=30):
+ def trigger_wifi_firmware_crash(self, ad, timeout=15):
pre_timestamp = ad.adb.getprop("vendor.debug.ssrdump.timestamp")
ad.adb.shell(
"setprop persist.vendor.sys.modem.diag.mdlog false", ignore_status=True)
@@ -153,14 +153,13 @@ class WifiCrashStressTest(WifiBaseTest):
asserts.assert_true(
utils.adb_shell_ping(self.dut_client, count=10, dest_ip=dut_addr, timeout=20),
"%s ping %s failed" % (self.dut_client.serial, dut_addr))
- wutils.reset_wifi(self.dut_client)
for count in range(self.stress_count):
self.log.info("%s: %d/%d" %
(self.current_test_name, count + 1, self.stress_count))
+ wutils.reset_wifi(self.dut_client)
# Trigger firmware crash
self.trigger_wifi_firmware_crash(self.dut)
# Connect DUT to Network
- wutils.wifi_toggle_state(self.dut_client, True)
wutils.connect_to_wifi_network(self.dut_client, config, check_connectivity=False)
# Ping the DUT
server_addr = self.dut.droid.connectivityGetIPv4Addresses("wlan0")[0]
@@ -199,11 +198,11 @@ class WifiCrashStressTest(WifiBaseTest):
# Client connects to Softap
wutils.wifi_toggle_state(self.dut_client, True)
wutils.connect_to_wifi_network(self.dut_client, config)
- wutils.reset_wifi(self.dut_client)
- wutils.reset_wifi(self.dut)
for count in range(self.stress_count):
self.log.info("%s: %d/%d" %
(self.current_test_name, count + 1, self.stress_count))
+ wutils.reset_wifi(self.dut_client)
+ wutils.reset_wifi(self.dut)
# Trigger firmware crash
self.trigger_wifi_firmware_crash(self.dut)
wutils.connect_to_wifi_network(self.dut, self.network)