Merge RP1A.200417.001
Change-Id: I05a93d44ab767fd7f640167aa168c480bccdd5e3
diff --git a/acts/tests/google/wifi/RttPreFlightTest.py b/acts/framework/acts/test_utils/wifi/RttPostFlightTest.py
similarity index 68%
copy from acts/tests/google/wifi/RttPreFlightTest.py
copy to acts/framework/acts/test_utils/wifi/RttPostFlightTest.py
index 8d7dc6f..cfc7c05 100644
--- a/acts/tests/google/wifi/RttPreFlightTest.py
+++ b/acts/framework/acts/test_utils/wifi/RttPostFlightTest.py
@@ -24,8 +24,8 @@
TIMEOUT = 60
WAIT_TIME = 10
-class RttPreFlightTest(WifiBaseTest):
- """Turns on/off 802.11mc AP before and after RTT tests."""
+class RttPostFlightTest(WifiBaseTest):
+ """Turns off 802.11mc AP after RTT tests."""
def setup_class(self):
super().setup_class()
@@ -34,25 +34,15 @@
self.unpack_userparams(req_param_names=required_params)
self.rpm_telnet = rutils.create_telnet_session(self.rpm_ip)
- ### Helper methods ###
- def _check_ap_state(self, state=True):
- curr_time = time.time()
- while time.time() < curr_time + TIMEOUT:
- time.sleep(WAIT_TIME)
- status = wutils.start_wifi_connection_scan_and_check_for_network(
- self.dut, SSID)
- if state and status or not state and not status:
- return True
- return False
-
### Tests ###
- def test_turn_on_80211mc_ap(self):
- self.rpm_telnet.turn_on(self.rpm_port)
- asserts.assert_true(self._check_ap_state(True),
- "Failed to turn on AP")
-
def test_turn_off_80211mc_ap(self):
self.rpm_telnet.turn_off(self.rpm_port)
- asserts.assert_true(self._check_ap_state(False),
- "Failed to turn off AP")
+ curr_time = time.time()
+ while time.time() < curr_time + TIMEOUT:
+ time.sleep(WAIT_TIME)
+ if not wutils.start_wifi_connection_scan_and_check_for_network(
+ self.dut, SSID):
+ return True
+ self.log.error("Failed to turn off AP")
+ return False
diff --git a/acts/tests/google/wifi/RttPreFlightTest.py b/acts/framework/acts/test_utils/wifi/RttPreFlightTest.py
similarity index 73%
rename from acts/tests/google/wifi/RttPreFlightTest.py
rename to acts/framework/acts/test_utils/wifi/RttPreFlightTest.py
index 8d7dc6f..bf21357 100644
--- a/acts/tests/google/wifi/RttPreFlightTest.py
+++ b/acts/framework/acts/test_utils/wifi/RttPreFlightTest.py
@@ -34,25 +34,15 @@
self.unpack_userparams(req_param_names=required_params)
self.rpm_telnet = rutils.create_telnet_session(self.rpm_ip)
- ### Helper methods ###
- def _check_ap_state(self, state=True):
- curr_time = time.time()
- while time.time() < curr_time + TIMEOUT:
- time.sleep(WAIT_TIME)
- status = wutils.start_wifi_connection_scan_and_check_for_network(
- self.dut, SSID)
- if state and status or not state and not status:
- return True
- return False
-
### Tests ###
def test_turn_on_80211mc_ap(self):
self.rpm_telnet.turn_on(self.rpm_port)
- asserts.assert_true(self._check_ap_state(True),
- "Failed to turn on AP")
-
- def test_turn_off_80211mc_ap(self):
- self.rpm_telnet.turn_off(self.rpm_port)
- asserts.assert_true(self._check_ap_state(False),
- "Failed to turn off AP")
+ curr_time = time.time()
+ while time.time() < curr_time + TIMEOUT:
+ time.sleep(WAIT_TIME)
+ if wutils.start_wifi_connection_scan_and_check_for_network(
+ self.dut, SSID):
+ return True
+ self.log.error("Failed to turn on AP")
+ return False
diff --git a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
index df303ce..d7f6ba8 100644
--- a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
@@ -40,15 +40,14 @@
not ad.droid.doesDeviceSupportWifiAwareFeature(),
"Device under test does not support Wi-Fi Aware - skipping test"
)
- wutils.wifi_toggle_state(ad, True)
- ad.droid.wifiP2pClose()
- utils.set_location_service(ad, True)
aware_avail = ad.droid.wifiIsAwareAvailable()
+ ad.droid.wifiP2pClose()
+ wutils.wifi_toggle_state(ad, True)
+ utils.set_location_service(ad, True)
if not aware_avail:
self.log.info('Aware not available. Waiting ...')
autils.wait_for_event(ad,
aconsts.BROADCAST_WIFI_AWARE_AVAILABLE)
- ad.ed.clear_all_events()
ad.aware_capabilities = autils.get_aware_capabilities(ad)
self.reset_device_parameters(ad)
self.reset_device_statistics(ad)
@@ -58,6 +57,7 @@
# set randomization interval to 0 (disable) to reduce likelihood of
# interference in tests
autils.configure_mac_random_interval(ad, 0)
+ ad.ed.clear_all_events()
def teardown_test(self):
for ad in self.android_devices:
diff --git a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
index 06b8b54..2321a71 100644
--- a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
+++ b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
@@ -106,6 +106,8 @@
isinstance(self.hidden_networks, list):
self.hidden_network = self.hidden_networks[0]
self.dut.droid.wifiRemoveNetworkSuggestions([])
+ self.dut.adb.shell(
+ "pm disable com.google.android.apps.carrier.carrierwifi")
def setup_test(self):
self.dut.droid.wakeLockAcquireBright()
@@ -130,6 +132,8 @@
self.dut.cat_adb_log(test_name, begin_time)
def teardown_class(self):
+ self.dut.adb.shell(
+ "pm enable com.google.android.apps.carrier.carrierwifi")
if "AccessPoint" in self.user_params:
del self.user_params["reference_networks"]
del self.user_params["open_network"]