Snap for 5140444 from dc3d96b2954de5da519a5ae81f52d6c78fb252f6 to pi-qpr2-releaseandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-release

Change-Id: Ie46b30036f8ca6e9a91df7114daf38d88517d6b8

2 files changed, 37 insertions, 50 deletions

diff --git a/acts/tests/google/wifi/WifiCrashStressTest.py b/acts/tests/google/wifi/WifiCrashStressTest.py
index f8855d0dca..73f6460a52 100755
--- a/acts/tests/google/wifi/WifiCrashStressTest.py
+++ b/acts/tests/google/wifi/WifiCrashStressTest.py
@@ -21,7 +21,7 @@ from acts import asserts
 from acts import utils
 from acts.test_decorators import test_tracker_info
 from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts.test_utils.tel.tel_test_utils import stop_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import disable_qxdm_logger
 
 WifiEnums = wutils.WifiEnums
 
@@ -92,7 +92,7 @@ class WifiCrashStressTest(WifiBaseTest):
         # Legacy pixels use persist.sys.modem.diag.mdlog.
         ad.adb.shell(
             "setprop persist.sys.modem.diag.mdlog false", ignore_status=True)
-        stop_qxdm_logger(ad)
+        disable_qxdm_logger(ad)
         cmd = ('am instrument -w -e request "4b 25 03 b0 00" '
                '"com.google.mdstest/com.google.mdstest.instrument.'
                'ModemCommandInstrumentation"')
diff --git a/acts/tests/google/wifi/WifiStressTest.py b/acts/tests/google/wifi/WifiStressTest.py
index e8b987d59b..d4d617fb82 100755
--- a/acts/tests/google/wifi/WifiStressTest.py
+++ b/acts/tests/google/wifi/WifiStressTest.py
@@ -15,8 +15,6 @@
 #   limitations under the License.
 
 import pprint
-import queue
-import threading
 import time
 
 import acts.base_test
@@ -76,8 +74,6 @@ class WifiStressTest(WifiBaseTest):
             self.iperf_server = self.iperf_servers[0]
         if hasattr(self, 'iperf_server'):
             self.iperf_server.start()
-            if(len(self.iperf_servers) > 1):
-                self.iperf_servers[1].start()
 
     def setup_test(self):
         self.dut.droid.wakeLockAcquireBright()
@@ -98,15 +94,13 @@ class WifiStressTest(WifiBaseTest):
         wutils.reset_wifi(self.dut)
         if hasattr(self, 'iperf_server'):
             self.iperf_server.stop()
-            if(len(self.iperf_servers) > 1):
-                self.iperf_servers[1].stop()
         if "AccessPoint" in self.user_params:
             del self.user_params["reference_networks"]
             del self.user_params["open_network"]
 
     """Helper Functions"""
 
-    def scan_and_connect_by_ssid(self, ad, network):
+    def scan_and_connect_by_ssid(self, network):
         """Scan for network and connect using network information.
 
         Args:
@@ -114,8 +108,9 @@ class WifiStressTest(WifiBaseTest):
 
         """
         ssid = network[WifiEnums.SSID_KEY]
-        wutils.start_wifi_connection_scan_and_ensure_network_found(ad, ssid)
-        wutils.wifi_connect(ad, network, num_of_tries=3)
+        wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
+            ssid)
+        wutils.wifi_connect(self.dut, network, num_of_tries=3)
 
     def scan_and_connect_by_id(self, network, net_id):
         """Scan for network and connect using network id.
@@ -252,19 +247,6 @@ class WifiStressTest(WifiBaseTest):
         finally:
             pass
 
-    def run_long_traffic(self, sec, args, q):
-        try:
-            # Start IPerf traffic
-            self.log.info("Running iperf client {}".format(args))
-            result, data = self.dut.run_iperf_client(self.iperf_server_address,
-                args, timeout=sec+1)
-            if not result:
-                self.log.debug("Error occurred in iPerf traffic.")
-                self.run_ping(sec)
-            q.put(True)
-        except:
-            q.put(False)
-
     """Tests"""
 
     @test_tracker_info(uuid="cd0016c6-58cf-4361-b551-821c0b8d2554")
@@ -353,32 +335,37 @@ class WifiStressTest(WifiBaseTest):
                4. Verify no WiFi disconnects/data interruption.
 
         """
-        self.scan_and_connect_by_ssid(self.dut, self.wpa_5g)
-        self.scan_and_connect_by_ssid(self.dut_client, self.wpa_5g)
-
-        q = queue.Queue()
-        sec = self.stress_hours * 60 * 60
-        start_time = time.time()
-
-        dl_args = "-p {} -t {} -R".format(self.iperf_server.port, sec)
-        dl = threading.Thread(target=self.run_long_traffic, args=(sec, dl_args, q))
-        dl.start()
-        if(len(self.iperf_servers) > 1):
-            ul_args = "-p {} -t {}".format(self.iperf_servers[1].port, sec)
-            ul = threading.Thread(target=self.run_long_traffic, args=(sec, ul_args, q))
-            ul.start()
-
-        dl.join()
-        if(len(self.iperf_servers) > 1):
-            ul.join()
-
+        try:
+            self.scan_and_connect_by_ssid(self.wpa_5g)
+            # Start IPerf traffic from server to phone.
+            # Download data for 5 hours.
+            sec = self.stress_hours * 60 * 60
+            args = "-p {} -t {} -R".format(self.iperf_server.port, sec)
+            self.log.info("Running iperf client {}".format(args))
+            start_time = time.time()
+            result, data = self.dut.run_iperf_client(self.iperf_server_address,
+                args, timeout=sec+1)
+            if not result:
+                self.log.debug("Error occurred in iPerf traffic.")
+                start_time = time.time()
+                self.run_ping(sec)
+            # Start IPerf traffic from phone to server.
+            # Upload data for 5 hours.
+            args = "-p {} -t {}".format(self.iperf_server.port, sec)
+            self.log.info("Running iperf client {}".format(args))
+            result, data = self.dut.run_iperf_client(self.iperf_server_address,
+                args, timeout=sec+1)
+            if not result:
+                self.log.debug("Error occurred in iPerf traffic.")
+                self.run_ping(sec)
+        except:
+            total_time = time.time() - start_time
+            raise signals.TestFailure("Network long-connect failed."
+                "WiFi State = %d" %self.dut.droid.wifiCheckState(),
+                extras={"Total Hours":"%d" %self.stress_hours,
+                    "Seconds Run":"%d" %total_time})
         total_time = time.time() - start_time
         self.log.debug("WiFi state = %d" %self.dut.droid.wifiCheckState())
-        while(q.qsize() > 0):
-            if not q.get():
-                raise signals.TestFailure("Network long-connect failed.",
-                    extras={"Total Hours":"%d" %self.stress_hours,
-                    "Seconds Run":"%d" %total_time})
         raise signals.TestPass(details="", extras={"Total Hours":"%d" %
             self.stress_hours, "Seconds Run":"%d" %total_time})
 
@@ -399,7 +386,7 @@ class WifiStressTest(WifiBaseTest):
                   "https://www.youtube.com/watch?v=rN6nlNC9WQA",
                   "https://www.youtube.com/watch?v=U--7hxRNPvk"]
         try:
-            self.scan_and_connect_by_ssid(self.dut, self.wpa_5g)
+            self.scan_and_connect_by_ssid(self.wpa_5g)
             start_time = time.time()
             for video in videos:
                 self.start_youtube_video(url=video, secs=10*60)
@@ -507,7 +494,7 @@ class WifiStressTest(WifiBaseTest):
         AP1_network = self.reference_networks[0]["5g"]
         AP2_network = self.reference_networks[1]["5g"]
         wutils.set_attns(self.attenuators, "AP1_on_AP2_off")
-        self.scan_and_connect_by_ssid(self.dut, AP1_network)
+        self.scan_and_connect_by_ssid(AP1_network)
         # Reduce iteration to half because each iteration does two roams.
         for count in range(int(self.stress_count/2)):
             self.log.info("Roaming iteration %d, from %s to %s", count,