commit 87345aab94d04e498917ff4477c48824df8d6552
author Qi Jiang <qijiang@google.com> Mon May 14 22:09:26 2018 -0700
committer Qi Jiang <qijiang@google.com> Tue May 15 17:37:16 2018 +0000
tree c69a1d8162bf8918149f465ca9576ee4a437cf09
parent 35d297eb67831cde25e62b51499852887edbe938

Merge "Minor fixes after the big cleanup" am: f5667c1e8f
am: 6684f23edf

Test: None
Bug: 65563975

Change-Id: I2f16664b898d427dc91498b67bfc7d273d6ba10c
(cherry picked from commit 87d8891fb050684dfddf6eca3a9897539ce80c63)

acts/framework/acts/test_utils/power/PowerBaseTest.py

diff --git a/acts/framework/acts/test_utils/power/PowerBaseTest.py b/acts/framework/acts/test_utils/power/PowerBaseTest.py
index e3918ea..0a45dd1 100644
--- a/acts/framework/acts/test_utils/power/PowerBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerBaseTest.py
@@ -24,7 +24,6 @@
 from acts import base_test
 from acts import utils
 from acts.controllers import monsoon
-from acts.test_utils.tel import tel_test_utils as telutils
 from acts.test_utils.wifi import wifi_test_utils as wutils
 from acts.test_utils.wifi import wifi_power_test_utils as wputils
 
@@ -132,7 +131,7 @@
 
         # Onetime task for each test class
         # Temporary fix for b/77873679
-        telutils.adb_disable_verity(self.dut)
+        self.adb_disable_verity()
         self.dut.adb.shell('mv /vendor/bin/chre /vendor/bin/chre_renamed')
         self.dut.adb.shell('pkill chre')
 
@@ -484,3 +483,14 @@
             self.log.warning('Cannot get iperf result. Setting to 0')
             throughput = 0
         return throughput
+
+    # TODO(@qijiang)Merge with tel_test_utils.py
+    def adb_disable_verity(self):
+        """Disable verity on the device.
+
+        """
+        if self.dut.adb.getprop("ro.boot.veritymode") == "enforcing":
+            self.dut.adb.disable_verity()
+            self.dut.reboot()
+            self.dut.adb.root()
+            self.dut.adb.remount()

acts/tests/google/power/wifi/PowerWiFidtimTest.py

diff --git a/acts/tests/google/power/wifi/PowerWiFidtimTest.py b/acts/tests/google/power/wifi/PowerWiFidtimTest.py
index b27be8d..28a340a 100644
--- a/acts/tests/google/power/wifi/PowerWiFidtimTest.py
+++ b/acts/tests/google/power/wifi/PowerWiFidtimTest.py
@@ -36,7 +36,7 @@
         # Initialize the dut to rock-bottom state
         wputils.change_dtim(
             self.dut,
-            gEnableModulatedDTIM=self.test_configs.dtim,
+            gEnableModulatedDTIM=int(self.test_configs.dtim),
             gMaxLIModulatedDTIM=dtim_max)
         self.dut.log.info('DTIM value of the phone is now {}'.format(
             self.test_configs.dtim))