Fix import erros in Wifi scripts.
Change-Id: I58f373fc9f0f151193d973980d5849a7675a92de
diff --git a/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py b/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py
index 225c783..ccc5afd 100644
--- a/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py
+++ b/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py
@@ -18,9 +18,10 @@
import time
import acts.base_test
-import acts.signals.generated_test as generated_test
+import acts.signals
import acts.test_utils.wifi_test_utils as wutils
-import acts.test_utils.wifi_test_utils.WifiEnums as WifiEnums
+
+WifiEnums = wutils.WifiEnums
# EAP Macros
EAP = WifiEnums.Eap
@@ -32,7 +33,7 @@
class WifiEnterpriseRoamingTest(acts.base_test.BaseTestClass):
def __init__(self, controllers):
- BaseTestClass.__init__(self, controllers)
+ acts.base_test.BaseTestClass.__init__(self, controllers)
self.tests = (
"test_roaming_with_different_auth_method",
)
@@ -206,7 +207,7 @@
return True
""" Tests Begin """
- @generated_test
+ @acts.signals.generated_test
def test_roaming_with_different_auth_method(self):
eap_configs = self.gen_eap_configs()
self.log.info("Testing %d different configs." % len(eap_configs))
diff --git a/acts/tests/google/wifi/WifiEnterpriseTest.py b/acts/tests/google/wifi/WifiEnterpriseTest.py
index 625926c..8fef2db 100755
--- a/acts/tests/google/wifi/WifiEnterpriseTest.py
+++ b/acts/tests/google/wifi/WifiEnterpriseTest.py
@@ -19,9 +19,10 @@
import time
import acts.base_test
-import acts.signals.generated_test as generated_test
+import acts.signals
import acts.test_utils.wifi_test_utils as wutils
-import acts.test_utils.wifi_test_utils.WifiEnums as WifiEnums
+
+WifiEnums = wutils.WifiEnums
# EAP Macros
EAP = WifiEnums.Eap
@@ -33,7 +34,7 @@
class WifiEnterpriseTest(acts.base_test.BaseTestClass):
def __init__(self, controllers):
- BaseTestClass.__init__(self, controllers)
+ acts.base_test.BaseTestClass.__init__(self, controllers)
self.tests = (
"test_eap_connect",
"test_eap_connect_negative",
@@ -315,7 +316,7 @@
return name
"""Tests"""
- @generated_test
+ @acts.signals.generated_test
def test_eap_connect(self):
"""Test connecting to enterprise networks of different authentication
types.
@@ -346,7 +347,7 @@
pprint.pformat(failed))
self.assert_true(len(failed) == 0, msg)
- @generated_test
+ @acts.signals.generated_test
def test_eap_connect_negative(self):
"""Test connecting to enterprise networks.
@@ -373,7 +374,7 @@
pprint.pformat(failed))
self.assert_true(len(failed) == 0, msg)
- @generated_test
+ @acts.signals.generated_test
def test_passpoint_connect(self):
"""Test connecting to enterprise networks of different authentication
types with passpoint support.
@@ -405,7 +406,7 @@
pprint.pformat(failed))
self.assert_true(len(failed) == 0, msg)
- @generated_test
+ @acts.signals.generated_test
def test_passpoint_connect_negative(self):
"""Test connecting to enterprise networks.
diff --git a/acts/tests/google/wifi/WifiManagerTest.py b/acts/tests/google/wifi/WifiManagerTest.py
index b08b3c1..51173e8 100755
--- a/acts/tests/google/wifi/WifiManagerTest.py
+++ b/acts/tests/google/wifi/WifiManagerTest.py
@@ -16,19 +16,20 @@
import itertools
import pprint
+import queue
import time
-from queue import Empty
import acts.base_test
-import acts.signals.generated_test as generated_test
+import acts.signals
import acts.test_utils.wifi_test_utils as wutils
-import acts.test_utils.wifi_test_utils.WifiEnums as WifiEnums
-import acts.test_utils.wifi_test_utils.WifiEventNames as WifiEventNames
+
+WifiEnums = wutils.WifiEnums
+WifiEventNames = wutils.WifiEventNames
class WifiManagerTest(acts.base_test.BaseTestClass):
def __init__(self, controllers):
- BaseTestClass.__init__(self, controllers)
+ acts.base_test.BaseTestClass.__init__(self, controllers)
self.tests = (
"test_toggle_state",
"test_toggle_with_screen",
@@ -108,7 +109,7 @@
result, data = ad.run_iperf_client(self.iperf_server_address,
port_arg)
self.log.debug(pprint.pformat(data))
- except Empty:
+ except queue.Empty:
self.log.exception("Failed to connect to {}".format(SSID))
finally:
droid.wifiStopTrackingStateChange()
@@ -197,7 +198,7 @@
self.assert_true(nw[WifiEnums.BSSID_KEY] != ssid,
"Found forgotten network %s in configured networks." % ssid)
- @generated_test
+ @acts.signals.generated_test
def test_iot_with_password(self):
params = list(itertools.product(self.iot_networks, self.android_devices))
name_gen = lambda p : "test_connection_to-%s" % p[0][WifiEnums.SSID_KEY]
diff --git a/acts/tests/google/wifi/WifiRttManagerTest.py b/acts/tests/google/wifi/WifiRttManagerTest.py
index c3d0954..2a1ee76 100644
--- a/acts/tests/google/wifi/WifiRttManagerTest.py
+++ b/acts/tests/google/wifi/WifiRttManagerTest.py
@@ -19,10 +19,11 @@
import acts.base_test
import acts.test_utils.wifi_test_utils as wutils
-import acts.test_utils.wifi_test_utils.WifiEnums as WifiEnums
-import acts.utils.trim_model_name as trim_model_name
+import acts.utils
from acts.controllers.android import SL4AAPIError
+WifiEnums = wutils.WifiEnums
+
# Macros for RttParam keywords
RttParam = WifiEnums.RttParam
# Macros for RttManager
@@ -44,7 +45,7 @@
MAX_RTT_AP = 10
def __init__(self, controllers):
- BaseTestClass.__init__(self, controllers)
+ acts.base_test.BaseTestClass.__init__(self, controllers)
self.tests = (
"test_support_check",
"test_invalid_params",
@@ -436,7 +437,7 @@
"""No device supports device-to-device RTT; only shamu and volantis
devices support device-to-ap RTT.
"""
- model = trim_model_name(self.dut.model)
+ model = acts.utils.trim_model_name(self.dut.model)
self.assert_true(not self.droid.wifiIsDeviceToDeviceRttSupported(),
"Device to device is not supposed to be supported.")
if any([model in m for m in self.support_models]):
@@ -457,7 +458,7 @@
caps = self.droid.wifiRttGetCapabilities()
self.assert_true(caps, "Unable to get rtt capabilities.")
self.log.debug("Got rtt capabilities %s" % caps)
- model = trim_model_name(self.dut.model)
+ model = acts.utils.trim_model_name(self.dut.model)
self.assert_true(model in self.rtt_cap_table, "Unknown model %s" % model)
expected_caps = self.rtt_cap_table[model]
for k, v in expected_caps.items():