commit 7aa7c4c7719efeaf08ebd36b3ba9daae8806fa42
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 19 02:15:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 19 02:15:50 2018 +0000
tree 634d828e6db1f6a541a711cf2f48d7d2093ad026
parent b36f14c71349c1861b80aa550aa0884feca9a93a
parent 9a3f7bc734114eaff06ba9af9d42a595f4f52ee6

Merge "Forget networks before wifi firmware crash"

acts/tests/google/wifi/WifiCrashStressTest.py

diff --git a/acts/tests/google/wifi/WifiCrashStressTest.py b/acts/tests/google/wifi/WifiCrashStressTest.py
index c628b6b..0c50629 100755
--- a/acts/tests/google/wifi/WifiCrashStressTest.py
+++ b/acts/tests/google/wifi/WifiCrashStressTest.py
@@ -85,7 +85,7 @@
             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 @@
         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 @@
         # 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)