commit c2d4521f210af55f30adaba526d08d4b968b3f8e
author Ang Li <angli@google.com> Thu Mar 10 18:38:53 2016 -0800
committer tturney <tturney@google.com> Wed Mar 30 12:14:55 2016 -0700
tree 87f05dcc61cd43fc0715caa7177cbe4e84ad9698
parent 8893e6d4725782efcf07e55993164a499be5b273

Update wifi tests to use asserts from acts.asserts

Bug=27347031

Change-Id: I4b104008ca766a469329828d93c3bfd6d417ca40

acts/tests/google/wifi/WifiEnterpriseTest.py

diff --git a/acts/tests/google/wifi/WifiEnterpriseTest.py b/acts/tests/google/wifi/WifiEnterpriseTest.py
index b77e321..3987e43 100755
--- a/acts/tests/google/wifi/WifiEnterpriseTest.py
+++ b/acts/tests/google/wifi/WifiEnterpriseTest.py
@@ -22,6 +22,8 @@
 import acts.signals
 import acts.test_utils.wifi.wifi_test_utils as wutils
 
+from acts import asserts
+
 WifiEnums = wutils.WifiEnums
 
 # EAP Macros
@@ -159,7 +161,7 @@
             True if connection failed as expected, False otherwise.
         """
         verdict = wutils.eap_connect(config, ad)
-        self.assert_true(not verdict, "Connection should have failed.")
+        asserts.assert_true(not verdict, "Connection should have failed.")
         self.log.info("Connection failed as expected.")
         return True
 
@@ -344,7 +346,7 @@
             name_func=self.gen_eap_test_name)
         msg = ("The following configs failed EAP connect test: %s" %
                pprint.pformat(failed))
-        self.assert_true(len(failed) == 0, msg)
+        asserts.assert_true(len(failed) == 0, msg)
 
     @acts.signals.generated_test
     def test_eap_connect_negative(self):
@@ -371,7 +373,7 @@
             name_func=name_gen)
         msg = ("The following configs failed negative EAP connect test: %s" %
                pprint.pformat(failed))
-        self.assert_true(len(failed) == 0, msg)
+        asserts.assert_true(len(failed) == 0, msg)
 
     @acts.signals.generated_test
     def test_passpoint_connect(self):
@@ -391,7 +393,7 @@
             Successful connection and Internet access through the enterprise
             networks with passpoint support.
         """
-        self.skip_if(not self.dut.droid.wifiIsPasspointSupported(),
+        asserts.skip_if(not self.dut.droid.wifiIsPasspointSupported(),
             "Passpoint is not supported on device %s" % self.dut.model)
         passpoint_configs = self.gen_passpoint_configs()
         self.log.info("Testing %d different configs." % len(passpoint_configs))
@@ -403,7 +405,7 @@
             name_func=self.gen_passpoint_test_name)
         msg = ("The following configs failed passpoint connect test: %s" %
                pprint.pformat(failed))
-        self.assert_true(len(failed) == 0, msg)
+        asserts.assert_true(len(failed) == 0, msg)
 
     @acts.signals.generated_test
     def test_passpoint_connect_negative(self):
@@ -416,7 +418,7 @@
         Expect:
             Fail to establish connection.
         """
-        self.skip_if(not self.dut.droid.wifiIsPasspointSupported(),
+        asserts.skip_if(not self.dut.droid.wifiIsPasspointSupported(),
             "Passpoint is not supported on device %s" % self.dut.model)
         neg_passpoint_configs = self.gen_negative_passpoint_configs()
         self.log.info("Testing %d different configs." % len(neg_passpoint_configs))
@@ -432,4 +434,4 @@
             name_func=name_gen)
         msg = ("The following configs failed negative passpoint connect test: "
                "%s") % pprint.pformat(failed)
-        self.assert_true(len(failed) == 0, msg)
+        asserts.assert_true(len(failed) == 0, msg)