Skip wep related case if AP is not support. am: 2332dc72d0
Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2801253
Change-Id: I509a8fb7b5c75d41166a1d51ee9719b405d8d527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/acts/framework/acts/controllers/openwrt_ap.py b/acts/framework/acts/controllers/openwrt_ap.py
index 2f6c70b..a9d1ca3 100644
--- a/acts/framework/acts/controllers/openwrt_ap.py
+++ b/acts/framework/acts/controllers/openwrt_ap.py
@@ -1,5 +1,6 @@
"""Controller for Open WRT access point."""
+import ast
import logging
import random
import re
@@ -653,6 +654,19 @@
self.log.info("Failed to retrieve OpenWrt model information.")
return None
+ def get_version(self):
+ """Get Openwrt version.
+
+ Returns:
+ A string with version number.
+ """
+ out = self.ssh.run(SYSTEM_INFO_CMD).stdout
+ return ast.literal_eval(out)["release"]["version"]
+
+ def is_version_under_20(self):
+ """Boolean if version under 20."""
+ return int(self.get_version().split(".")[0]) < 20
+
def close(self):
"""Reset wireless and network settings to default and stop AP."""
try:
diff --git a/acts_tests/tests/google/wifi/WifiManagerTest.py b/acts_tests/tests/google/wifi/WifiManagerTest.py
index 8d52a86..b700445 100644
--- a/acts_tests/tests/google/wifi/WifiManagerTest.py
+++ b/acts_tests/tests/google/wifi/WifiManagerTest.py
@@ -82,9 +82,10 @@
if "AccessPoint" in self.user_params:
self.legacy_configure_ap_and_start(wpa_network=True, wep_network=True)
elif "OpenWrtAP" in self.user_params:
+ self.openwrt = self.access_points[0]
self.configure_openwrt_ap_and_start(open_network=True,
wpa_network=True,
- wep_network=True)
+ wep_network=self.openwrt.is_version_under_20())
asserts.assert_true(
len(self.reference_networks) > 0,
@@ -1021,6 +1022,10 @@
1. Ensure the 2GHz WEP network is visible in scan result.
2. Connect to the network and validate internet connection.
"""
+ asserts.skip_if(
+ hasattr(self, "openwrt") and not self.access_points[0].is_version_under_20(),
+ "OpenWrt no longer support wep network."
+ )
wutils.connect_to_wifi_network(self.dut, self.wep_networks[0]["2g"])
@test_tracker_info(uuid="1f2d17a2-e92d-43af-966b-3421c0db8620")
@@ -1031,6 +1036,10 @@
1. Ensure the 5GHz WEP network is visible in scan result.
2. Connect to the network and validate internet connection.
"""
+ asserts.skip_if(
+ hasattr(self, "openwrt") and not self.access_points[0].is_version_under_20(),
+ "OpenWrt no longer support wep network."
+ )
wutils.connect_to_wifi_network(self.dut, self.wep_networks[0]["5g"])
@test_tracker_info(uuid="4a957952-289d-4657-9882-e1475274a7ff")
diff --git a/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py b/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py
index b1508be..6bbeb5e 100644
--- a/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py
+++ b/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py
@@ -61,9 +61,10 @@
self.legacy_configure_ap_and_start(wpa_network=True,
wep_network=True)
elif "OpenWrtAP" in self.user_params:
+ self.openwrt = self.access_points[0]
self.configure_openwrt_ap_and_start(open_network=True,
wpa_network=True,
- wep_network=True)
+ wep_network=self.openwrt.is_version_under_20())
asserts.assert_true(
len(self.reference_networks) > 0,
diff --git a/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py b/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py
index 43f8438..06bfa53 100644
--- a/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py
+++ b/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py
@@ -203,8 +203,9 @@
channel_2g=channel_2g,
channel_5g=channel_5g)
elif "OpenWrtAP" in self.user_params:
+ self.openwrt = self.access_points[0]
self.configure_openwrt_ap_and_start(wpa_network=True,
- wep_network=True,
+ wep_network=self.openwrt.is_version_under_20(),
channel_2g=channel_2g,
channel_5g=channel_5g)
