Merge "Replace getBuildserial with serial."master-cuttlefish-testing-release

3 files changed, 6 insertions, 8 deletions

diff --git a/acts/framework/acts/test_utils/coex/CoexBaseTest.py b/acts/framework/acts/test_utils/coex/CoexBaseTest.py
index 75eeb27348..2d638a9ff9 100644
--- a/acts/framework/acts/test_utils/coex/CoexBaseTest.py
+++ b/acts/framework/acts/test_utils/coex/CoexBaseTest.py
@@ -211,7 +211,7 @@ class CoexBaseTest(BaseTestClass):
         out_file_name = "{}/IPerfServer,{},{}.log".format(log_path,
                 server_port, self.tag,)
         self.tag = self.tag + 1
-        cmd = "adb -s {} shell {}".format(self.pri_ad.droid.getBuildSerial(),
+        cmd = "adb -s {} shell {}".format(self.pri_ad.serial,
                 self.iperf_server)
 
         def appender_iperf_logs(line):
diff --git a/acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py b/acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py
index 5eda429502..c89c56f450 100644
--- a/acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py
+++ b/acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py
@@ -25,11 +25,8 @@ from acts.test_utils.coex.coex_test_utils import (
     collect_bluetooth_manager_dumpsys_logs)
 from acts.test_utils.coex.coex_test_utils import multithread_func
 from acts.test_utils.coex.coex_test_utils import wifi_connection_check
-from acts.test_utils.coex.coex_test_utils import xlsheet
-from acts.test_utils.wifi.wifi_test_utils import reset_wifi
 from acts.test_utils.wifi.wifi_test_utils import wifi_connect
 from acts.test_utils.wifi.wifi_test_utils import wifi_test_device_init
-from acts.test_utils.wifi.wifi_test_utils import wifi_toggle_state
 
 
 class CoexPerformanceBaseTest(CoexBaseTest):
@@ -86,7 +83,7 @@ class CoexPerformanceBaseTest(CoexBaseTest):
             self.log.info("Failed to disable bluetooth")
             return False
         self.destroy_android_and_relay_object()
-        self.rvr = None
+        self.rvr = {}
 
     def teardown_class(self):
         self.reset_wifi_and_store_results()
@@ -162,6 +159,7 @@ class CoexPerformanceBaseTest(CoexBaseTest):
             else:
                 self.iperf_received.append(
                     float(self.iperf_variables.received[-1].strip("Mb/s")))
+            self.iperf_variables.received = []
         for i in range(self.num_atten - 1):
             self.attenuators[i].set_atten(0)
         if "a2dp_streaming" in self.current_test_name:
diff --git a/acts/framework/acts/test_utils/coex/coex_test_utils.py b/acts/framework/acts/test_utils/coex/coex_test_utils.py
index 90a01fd523..ccfbfa78ba 100644
--- a/acts/framework/acts/test_utils/coex/coex_test_utils.py
+++ b/acts/framework/acts/test_utils/coex/coex_test_utils.py
@@ -175,7 +175,7 @@ def connect_dev_to_headset(pri_droid, dev_to_connect, profiles_set):
 
     if not paired:
         pri_droid.log.info("{} not paired to {}".format(
-            pri_droid.droid.getBuildSerial(), dev_to_connect))
+            pri_droid.serial, dev_to_connect))
         return False
 
     end_time = time.time() + 10
@@ -606,7 +606,7 @@ def media_stream_check(pri_ad, duration, headset_mac_address):
     while time.time() < duration:
         if not is_a2dp_connected(pri_ad, headset_mac_address):
             pri_ad.log.error('A2dp connection not active at %s',
-                    pri_ad.droid.getBuildSerial())
+                    pri_ad.serial)
             return False
         time.sleep(1)
     return True
@@ -682,7 +682,7 @@ def music_play_and_check_via_app(pri_ad, headset_mac_address, duration=5):
     try:
         if not media_stream_check(pri_ad, stream_time, headset_mac_address):
             pri_ad.log.error("A2dp connection not active at %s",
-                             pri_ad.droid.getBuildSerial())
+                             pri_ad.serial)
             return False
     finally:
         pri_ad.adb.shell("am force-stop com.google.android.music")