Fix import erros in Wifi scripts.
Change-Id: I58f373fc9f0f151193d973980d5849a7675a92de
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.