Update File Formatting with YAPF

Change-Id: I7bbf0403a6ede9cbf2581f921c5413a09b16e8d9
diff --git a/acts/framework/acts/test_utils/tel/tel_test_utils.py b/acts/framework/acts/test_utils/tel/tel_test_utils.py
index 68ce987..b4a6f8f 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -329,8 +329,8 @@
         if bt_state == state:
             return True
         if max_wait <= 0:
-            log.error("Time out: bluetooth state still {}, expecting {}".format(
-                bt_state, state))
+            log.error("Time out: bluetooth state still {}, expecting {}".
+                      format(bt_state, state))
             return False
 
         event = {False: _BLUETOOTH_STATE_OFF_EVENT,
@@ -433,8 +433,8 @@
         return False
 
     # APM on (new_state=True) will turn off wifi but may not turn it on
-    if new_state and not _wait_for_wifi_in_state(
-            log, ad, False, timeout_time - time.time()):
+    if new_state and not _wait_for_wifi_in_state(log, ad, False,
+                                                 timeout_time - time.time()):
         log.error("Failed waiting for wifi during airplane mode toggle")
         return False
 
diff --git a/acts/tests/google/tel/live/TelLiveVideoTest.py b/acts/tests/google/tel/live/TelLiveVideoTest.py
index f4eb6ba..f5ca20a 100644
--- a/acts/tests/google/tel/live/TelLiveVideoTest.py
+++ b/acts/tests/google/tel/live/TelLiveVideoTest.py
@@ -398,8 +398,8 @@
 
         if not call_id_requester or not call_id_responder:
             self.log.error("Couldn't find a candidate call id {}:{}, {}:{}"
-                           .format(ads[0].serial, call_id_requester, ads[
-                               1].serial, call_id_responder))
+                           .format(ads[0].serial, call_id_requester, ads[1]
+                                   .serial, call_id_responder))
             return False
 
         if not video_call_modify_video(self.log, ads[0], call_id_requester,
@@ -504,8 +504,8 @@
 
         if not call_id_requester or not call_id_responder:
             self.log.error("Couldn't find a candidate call id {}:{}, {}:{}"
-                           .format(ads[0].serial, call_id_requester, ads[
-                               1].serial, call_id_responder))
+                           .format(ads[0].serial, call_id_requester, ads[1]
+                                   .serial, call_id_responder))
             return False
 
         if not video_call_modify_video(
@@ -611,13 +611,13 @@
                 MAX_WAIT_TIME_VIDEO_SESSION_EVENT)
             if event_on_responder['data']['Event'] != SESSION_EVENT_RX_PAUSE:
                 self.log.error(
-                    "Event not correct. event_on_responder: {}. Expected :{}".format(
-                        event_on_responder, SESSION_EVENT_RX_PAUSE))
+                    "Event not correct. event_on_responder: {}. Expected :{}".
+                    format(event_on_responder, SESSION_EVENT_RX_PAUSE))
                 return False
             if event_on_requester['data']['Event'] != SESSION_EVENT_RX_PAUSE:
                 self.log.error(
-                    "Event not correct. event_on_requester: {}. Expected :{}".format(
-                        event_on_requester, SESSION_EVENT_RX_PAUSE))
+                    "Event not correct. event_on_requester: {}. Expected :{}".
+                    format(event_on_requester, SESSION_EVENT_RX_PAUSE))
                 return False
         except Empty:
             self.log.error("Expected event not received.")
@@ -654,13 +654,13 @@
                 MAX_WAIT_TIME_VIDEO_SESSION_EVENT)
             if event_on_responder['data']['Event'] != SESSION_EVENT_RX_RESUME:
                 self.log.error(
-                    "Event not correct. event_on_responder: {}. Expected :{}".format(
-                        event_on_responder, SESSION_EVENT_RX_RESUME))
+                    "Event not correct. event_on_responder: {}. Expected :{}".
+                    format(event_on_responder, SESSION_EVENT_RX_RESUME))
                 return False
             if event_on_requester['data']['Event'] != SESSION_EVENT_RX_RESUME:
                 self.log.error(
-                    "Event not correct. event_on_requester: {}. Expected :{}".format(
-                        event_on_requester, SESSION_EVENT_RX_RESUME))
+                    "Event not correct. event_on_requester: {}. Expected :{}".
+                    format(event_on_requester, SESSION_EVENT_RX_RESUME))
                 return False
         except Empty:
             self.log.error("Expected event not received.")
@@ -789,12 +789,13 @@
             return False
 
         self.log.info("Step2: Initiate Voice Call PhoneA->PhoneC.")
-        if not call_setup_teardown(self.log,
-                                   ads[0],
-                                   ads[2],
-                                   None,
-                                   verify_caller_func=None,
-                                   verify_callee_func=is_phone_in_call_volte):
+        if not call_setup_teardown(
+                self.log,
+                ads[0],
+                ads[2],
+                None,
+                verify_caller_func=None,
+                verify_callee_func=is_phone_in_call_volte):
             self.log.error("Failed to setup a call")
             return False
 
@@ -857,12 +858,13 @@
             return False
 
         self.log.info("Step2: Initiate Voice Call PhoneC->PhoneA.")
-        if not call_setup_teardown(self.log,
-                                   ads[2],
-                                   ads[0],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=None):
+        if not call_setup_teardown(
+                self.log,
+                ads[2],
+                ads[0],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=None):
             self.log.error("Failed to setup a call")
             return False
 
@@ -910,12 +912,13 @@
             return False
 
         self.log.info("Step1: Initiate VoLTE Call PhoneA->PhoneB.")
-        if not call_setup_teardown(self.log,
-                                   ads[0],
-                                   ads[1],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=is_phone_in_call_volte):
+        if not call_setup_teardown(
+                self.log,
+                ads[0],
+                ads[1],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=is_phone_in_call_volte):
             self.log.error("Failed to setup a call")
             return False
         calls = ads[0].droid.telecomCallGetCallIds()
@@ -983,12 +986,13 @@
             return False
 
         self.log.info("Step1: Initiate VoLTE Call PhoneA->PhoneB.")
-        if not call_setup_teardown(self.log,
-                                   ads[0],
-                                   ads[1],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=is_phone_in_call_volte):
+        if not call_setup_teardown(
+                self.log,
+                ads[0],
+                ads[1],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=is_phone_in_call_volte):
             self.log.error("Failed to setup a call")
             return False
         calls = ads[0].droid.telecomCallGetCallIds()
@@ -1075,12 +1079,13 @@
             return False
 
         self.log.info("Step2: Initiate Voice Call PhoneC->PhoneA.")
-        if not call_setup_teardown(self.log,
-                                   ads[2],
-                                   ads[0],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=None):
+        if not call_setup_teardown(
+                self.log,
+                ads[2],
+                ads[0],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=None):
             self.log.error("Failed to setup a call")
             return False
 
@@ -1184,12 +1189,13 @@
             return False
 
         self.log.info("Step2: Initiate Voice Call PhoneC->PhoneA.")
-        if not call_setup_teardown(self.log,
-                                   ads[2],
-                                   ads[0],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=None):
+        if not call_setup_teardown(
+                self.log,
+                ads[2],
+                ads[0],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=None):
             self.log.error("Failed to setup a call")
             return False
 
@@ -1643,10 +1649,9 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
         self.log.info(
@@ -1721,14 +1726,12 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
-        self.log.info(
-            "End call on PhoneB and verify call continues.")
+        self.log.info("End call on PhoneB and verify call continues.")
         ads[1].droid.telecomEndCall()
         time.sleep(WAIT_TIME_IN_CALL)
         calls = ads[0].droid.telecomCallGetCallIds()
@@ -1778,8 +1781,7 @@
             True)
 
     def _test_call_volte_add_mo_video_accept_as_voice_merge_drop(
-            self,
-            use_cep=False):
+            self, use_cep=False):
         # This test case is not supported by VZW.
         ads = self.android_devices
         tasks = [(phone_setup_video, (self.log, ads[0])),
@@ -1873,8 +1875,7 @@
             True)
 
     def _test_call_volte_add_mt_video_accept_as_voice_merge_drop(
-            self,
-            use_cep=False):
+            self, use_cep=False):
         ads = self.android_devices
         tasks = [(phone_setup_video, (self.log, ads[0])),
                  (phone_setup_volte, (self.log, ads[1])), (phone_setup_video,
@@ -1997,12 +1998,13 @@
             return False
 
         self.log.info("Step2: Initiate Voice Call PhoneA->PhoneC.")
-        if not call_setup_teardown(self.log,
-                                   ads[0],
-                                   ads[2],
-                                   None,
-                                   verify_caller_func=None,
-                                   verify_callee_func=is_phone_in_call_volte):
+        if not call_setup_teardown(
+                self.log,
+                ads[0],
+                ads[2],
+                None,
+                verify_caller_func=None,
+                verify_callee_func=is_phone_in_call_volte):
             self.log.error("Failed to setup a call")
             return False
 
@@ -2145,12 +2147,13 @@
             return False
 
         self.log.info("Step2: Initiate Voice Call PhoneC->PhoneA.")
-        if not call_setup_teardown(self.log,
-                                   ads[2],
-                                   ads[0],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=None):
+        if not call_setup_teardown(
+                self.log,
+                ads[2],
+                ads[0],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=None):
             self.log.error("Failed to setup a call")
             return False
 
@@ -2272,12 +2275,13 @@
             return False
 
         self.log.info("Step1: Initiate VoLTE Call PhoneA->PhoneB.")
-        if not call_setup_teardown(self.log,
-                                   ads[0],
-                                   ads[1],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=is_phone_in_call_volte):
+        if not call_setup_teardown(
+                self.log,
+                ads[0],
+                ads[1],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=is_phone_in_call_volte):
             self.log.error("Failed to setup a call")
             return False
         calls = ads[0].droid.telecomCallGetCallIds()
@@ -2399,12 +2403,13 @@
             return False
 
         self.log.info("Step1: Initiate VoLTE Call PhoneA->PhoneB.")
-        if not call_setup_teardown(self.log,
-                                   ads[0],
-                                   ads[1],
-                                   None,
-                                   verify_caller_func=is_phone_in_call_volte,
-                                   verify_callee_func=is_phone_in_call_volte):
+        if not call_setup_teardown(
+                self.log,
+                ads[0],
+                ads[1],
+                None,
+                verify_caller_func=is_phone_in_call_volte,
+                verify_callee_func=is_phone_in_call_volte):
             self.log.error("Failed to setup a call")
             return False
         calls = ads[0].droid.telecomCallGetCallIds()
diff --git a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
index ca77613..bf679a4 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
@@ -384,7 +384,7 @@
             # Airplane Mode, WiFi Preferred
             "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_second_call_from_host_wfc_apm_wifi_preferred_cep",
             "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_cep",
-            )
+        )
 
         self.wifi_network_ssid = self.user_params["wifi_network_ssid"]
 
@@ -434,12 +434,13 @@
                     raise _CallException("Clear call list failed.")
 
             self.log.info("Step1: Call From PhoneA to PhoneB.")
-            if not call_setup_teardown(self.log,
-                                       ads[0],
-                                       ads[1],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_a,
-                                       verify_callee_func=verify_func_b):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[0],
+                    ads[1],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_a,
+                    verify_callee_func=verify_func_b):
                 raise _CallException("PhoneA call PhoneB failed.")
 
             calls = ads[0].droid.telecomCallGetCallIds()
@@ -449,12 +450,13 @@
             call_ab_id = calls[0]
 
             self.log.info("Step2: Call From PhoneA to PhoneC.")
-            if not call_setup_teardown(self.log,
-                                       ads[0],
-                                       ads[2],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_a,
-                                       verify_callee_func=verify_func_c):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[0],
+                    ads[2],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_a,
+                    verify_callee_func=verify_func_c):
                 raise _CallException("PhoneA call PhoneC failed.")
             if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]],
                                        True):
@@ -504,12 +506,13 @@
                     raise _CallException("Clear call list failed.")
 
             self.log.info("Step1: Call From PhoneA to PhoneB.")
-            if not call_setup_teardown(self.log,
-                                       ads[0],
-                                       ads[1],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_a,
-                                       verify_callee_func=verify_func_b):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[0],
+                    ads[1],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_a,
+                    verify_callee_func=verify_func_b):
                 raise _CallException("PhoneA call PhoneB failed.")
 
             calls = ads[0].droid.telecomCallGetCallIds()
@@ -519,12 +522,13 @@
             call_ab_id = calls[0]
 
             self.log.info("Step2: Call From PhoneC to PhoneA.")
-            if not call_setup_teardown(self.log,
-                                       ads[2],
-                                       ads[0],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_c,
-                                       verify_callee_func=verify_func_a):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[2],
+                    ads[0],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_c,
+                    verify_callee_func=verify_func_a):
                 raise _CallException("PhoneA call PhoneC failed.")
             if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]],
                                        True):
@@ -559,12 +563,13 @@
         try:
             verify_func_a, verify_func_b = verify_funcs
             self.log.info("Step1: Call From PhoneA to PhoneB.")
-            if not call_setup_teardown(self.log,
-                                       ads[0],
-                                       ads[1],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_a,
-                                       verify_callee_func=verify_func_b):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[0],
+                    ads[1],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_a,
+                    verify_callee_func=verify_func_b):
                 raise _CallException("PhoneA call PhoneB failed.")
 
             self.log.info("Step2: Call From PhoneC to PhoneA then decline.")
@@ -618,12 +623,13 @@
                     raise _CallException("Clear call list failed.")
 
             self.log.info("Step1: Call From PhoneB to PhoneA.")
-            if not call_setup_teardown(self.log,
-                                       ads[1],
-                                       ads[0],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_b,
-                                       verify_callee_func=verify_func_a):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[1],
+                    ads[0],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_b,
+                    verify_callee_func=verify_func_a):
                 raise _CallException("PhoneB call PhoneA failed.")
 
             calls = ads[0].droid.telecomCallGetCallIds()
@@ -633,12 +639,13 @@
             call_ab_id = calls[0]
 
             self.log.info("Step2: Call From PhoneC to PhoneA.")
-            if not call_setup_teardown(self.log,
-                                       ads[2],
-                                       ads[0],
-                                       ad_hangup=None,
-                                       verify_caller_func=verify_func_c,
-                                       verify_callee_func=verify_func_a):
+            if not call_setup_teardown(
+                    self.log,
+                    ads[2],
+                    ads[0],
+                    ad_hangup=None,
+                    verify_caller_func=verify_func_c,
+                    verify_callee_func=verify_func_a):
                 raise _CallException("PhoneA call PhoneC failed.")
             if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]],
                                        True):
@@ -731,12 +738,13 @@
 
         if num_swaps > 0:
             self.log.info("Step3: Begin Swap x{} test.".format(num_swaps))
-            if not swap_calls(self.log,
-                              ads,
-                              call_ab_id,
-                              call_ac_id,
-                              num_swaps,
-                              check_call_status=False):
+            if not swap_calls(
+                    self.log,
+                    ads,
+                    call_ab_id,
+                    call_ac_id,
+                    num_swaps,
+                    check_call_status=False):
                 self.log.error("Swap test failed.")
                 return None, None, None
 
@@ -784,12 +792,13 @@
 
         if num_swaps > 0:
             self.log.info("Step3: Begin Swap x{} test.".format(num_swaps))
-            if not swap_calls(self.log,
-                              ads,
-                              call_ab_id,
-                              call_ac_id,
-                              num_swaps,
-                              check_call_status=False):
+            if not swap_calls(
+                    self.log,
+                    ads,
+                    call_ab_id,
+                    call_ac_id,
+                    num_swaps,
+                    check_call_status=False):
                 self.log.error("Swap test failed.")
                 return None, None, None
 
@@ -1085,9 +1094,8 @@
         # make sure PhoneB and PhoneC are GSM phone before proceed.
         for ad in [ads[1], ads[2]]:
             if (ad.droid.telephonyGetPhoneType() != PHONE_TYPE_GSM):
-                self.log.error(
-                    "{} not GSM phone, abort wcdma swap test.".format(
-                        ad.serial))
+                self.log.error("{} not GSM phone, abort wcdma swap test.".
+                               format(ad.serial))
                 return None, None
 
         call_ab_id = self._three_phone_call_mo_add_mo(
@@ -1138,9 +1146,8 @@
         # make sure PhoneB and PhoneC are GSM phone before proceed.
         for ad in [ads[1], ads[2]]:
             if (ad.droid.telephonyGetPhoneType() != PHONE_TYPE_GSM):
-                self.log.error(
-                    "{} not GSM phone, abort wcdma swap test.".format(
-                        ad.serial))
+                self.log.error("{} not GSM phone, abort wcdma swap test.".
+                               format(ad.serial))
                 return None, None
 
         call_ab_id = self._three_phone_call_mo_add_mt(
@@ -1191,9 +1198,8 @@
         # make sure PhoneB and PhoneC are GSM phone before proceed.
         for ad in [ads[1], ads[2]]:
             if (ad.droid.telephonyGetPhoneType() != PHONE_TYPE_GSM):
-                self.log.error(
-                    "{} not GSM phone, abort wcdma swap test.".format(
-                        ad.serial))
+                self.log.error("{} not GSM phone, abort wcdma swap test.".
+                               format(ad.serial))
                 return None, None
 
         call_ab_id = self._three_phone_call_mt_add_mt(
@@ -1672,10 +1678,9 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
         self.log.info("Step5: End call on PhoneC and verify call continues.")
@@ -1757,10 +1762,9 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return None
 
         return call_conf_id
@@ -2022,10 +2026,9 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
         self.log.info("Step5: End call on PhoneC and verify call continues.")
@@ -2385,9 +2388,8 @@
         # make sure PhoneB and PhoneC are GSM phone before proceed.
         for ad in [ads[1], ads[2]]:
             if (ad.droid.telephonyGetPhoneType() != PHONE_TYPE_GSM):
-                self.log.error(
-                    "{} not GSM phone, abort wcdma swap test.".format(
-                        ad.serial))
+                self.log.error("{} not GSM phone, abort wcdma swap test.".
+                               format(ad.serial))
                 return None, None
 
         # To make thing simple, for epdg, setup should be called before calling
@@ -2439,9 +2441,8 @@
         # make sure PhoneB and PhoneC are GSM phone before proceed.
         for ad in [ads[1], ads[2]]:
             if (ad.droid.telephonyGetPhoneType() != PHONE_TYPE_GSM):
-                self.log.error(
-                    "{} not GSM phone, abort wcdma swap test.".format(
-                        ad.serial))
+                self.log.error("{} not GSM phone, abort wcdma swap test.".
+                               format(ad.serial))
                 return None, None
 
         # To make thing simple, for epdg, setup should be called before calling
@@ -2493,9 +2494,8 @@
         # make sure PhoneB and PhoneC are GSM phone before proceed.
         for ad in [ads[1], ads[2]]:
             if (ad.droid.telephonyGetPhoneType() != PHONE_TYPE_GSM):
-                self.log.error(
-                    "{} not GSM phone, abort wcdma swap test.".format(
-                        ad.serial))
+                self.log.error("{} not GSM phone, abort wcdma swap test.".
+                               format(ad.serial))
                 return None, None
 
         # To make thing simple, for epdg, setup should be called before calling
@@ -2724,10 +2724,9 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
         self.log.info("Step5: End call on PhoneC and verify call continues.")
@@ -7282,10 +7281,9 @@
         # Check if Conf Call currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
         # Unmerge
@@ -7309,10 +7307,9 @@
         # Unmerged call in call state ACTIVE?
         if ads[0].droid.telecomCallGetCallState(
                 call_ab_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_ab_id, ads[0].droid.telecomCallGetCallState(
-                        call_ab_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_ab_id, ads[0]
+                                  .droid.telecomCallGetCallState(call_ab_id)))
             return False
 
         # Swap call
@@ -7325,10 +7322,9 @@
         # Other call in call state ACTIVE?
         if ads[0].droid.telecomCallGetCallState(
                 call_ac_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_ac_id, ads[0].droid.telecomCallGetCallState(
-                        call_ac_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_ac_id, ads[0]
+                                  .droid.telecomCallGetCallState(call_ac_id)))
             return False
 
         # All calls still CONNECTED?
@@ -7831,8 +7827,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -7861,8 +7857,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -7891,8 +7887,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8430,8 +8426,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8460,8 +8456,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8490,8 +8486,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8521,8 +8517,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8550,8 +8546,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8580,8 +8576,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8610,8 +8606,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8641,8 +8637,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8670,8 +8666,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8699,8 +8695,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8729,8 +8725,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8759,8 +8755,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8788,8 +8784,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8817,8 +8813,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8847,8 +8843,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -8877,8 +8873,8 @@
         tasks = [(phone_setup_iwlan,
                   (self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
                    self.wifi_network_ssid, self.wifi_network_pass)),
-                 (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
-                                                        (self.log, ads[2]))]
+                 (phone_setup_voice_3g, (self.log, ads[1])), (
+                     phone_setup_voice_3g, (self.log, ads[2]))]
         if not multithread_func(self.log, tasks):
             self.log.error("Phone Failed to Set Up Properly.")
             return False
@@ -9726,10 +9722,9 @@
         # Check if Conf Call is currently active
         if ads[0].droid.telecomCallGetCallState(
                 call_conf_id) != CALL_STATE_ACTIVE:
-            self.log.error(
-                "Call_id:{}, state:{}, expected: STATE_ACTIVE".format(
-                    call_conf_id, ads[0].droid.telecomCallGetCallState(
-                        call_conf_id)))
+            self.log.error("Call_id:{}, state:{}, expected: STATE_ACTIVE".
+                           format(call_conf_id, ads[
+                               0].droid.telecomCallGetCallState(call_conf_id)))
             return False
 
         self.log.info("Step5: End call on PhoneC and verify call continues.")
diff --git a/acts/tests/google/tel/live/TelPowerTest.py b/acts/tests/google/tel/live/TelPowerTest.py
index 37b88d9..86472c8 100644
--- a/acts/tests/google/tel/live/TelPowerTest.py
+++ b/acts/tests/google/tel/live/TelPowerTest.py
@@ -110,8 +110,7 @@
             "test_power_mobile_data_always_on_lte_wifi_on",
             "test_power_mobile_data_always_on_wcdma_wifi_on",
             "test_power_mobile_data_always_on_gsm_wifi_on",
-            "test_power_mobile_data_always_on_1x_wifi_on"
-            )
+            "test_power_mobile_data_always_on_1x_wifi_on")
 
     def setup_class(self):
         super().setup_class()
@@ -166,16 +165,13 @@
                 self.log.error("DUT Failed to Set Up Properly.")
                 return False
             result = self.mon.measure_power(
-                ACTIVE_CALL_TEST_SAMPLING_RATE,
-                ACTIVE_CALL_TEST_SAMPLE_TIME,
-                test_name,
-                ACTIVE_CALL_TEST_OFFSET_TIME
-                )
+                ACTIVE_CALL_TEST_SAMPLING_RATE, ACTIVE_CALL_TEST_SAMPLE_TIME,
+                test_name, ACTIVE_CALL_TEST_OFFSET_TIME)
             self._save_logs_for_power_test(test_name, result)
             average_current = result.average_current
-            if not verify_incall_state(self.log, [self.android_devices[0],
-                                                  self.android_devices[1]],
-                                       True):
+            if not verify_incall_state(self.log, [
+                    self.android_devices[0], self.android_devices[1]
+            ], True):
                 self.log.error("Call drop during power test.")
                 return False
             if ((phone_check_func_after_power_test is not None) and
@@ -203,12 +199,9 @@
             if not test_setup_func(self.android_devices[0], *args, **kwargs):
                 self.log.error("DUT Failed to Set Up Properly.")
                 return False
-            result = self.mon.measure_power(
-                IDLE_TEST_SAMPLING_RATE,
-                IDLE_TEST_SAMPLE_TIME,
-                test_name,
-                IDLE_TEST_OFFSET_TIME
-                )
+            result = self.mon.measure_power(IDLE_TEST_SAMPLING_RATE,
+                                            IDLE_TEST_SAMPLE_TIME, test_name,
+                                            IDLE_TEST_OFFSET_TIME)
             self._save_logs_for_power_test(test_name, result)
             average_current = result.average_current
             if ((phone_check_func_after_power_test is not None) and
@@ -241,7 +234,9 @@
         ad.droid.goToSleepNow()
         return True
 
-    def _setup_phone_mobile_data_always_on(self, ad, phone_setup_func,
+    def _setup_phone_mobile_data_always_on(self,
+                                           ad,
+                                           phone_setup_func,
                                            connect_wifi,
                                            wifi_ssid=None,
                                            wifi_password=None,
@@ -251,8 +246,8 @@
             self.log.error("Phone failed to setup {}.".format(
                 phone_setup_func.__name__))
             return False
-        if (connect_wifi and
-            not ensure_wifi_connected(self.log, ad, wifi_ssid, wifi_password)):
+        if (connect_wifi and not ensure_wifi_connected(self.log, ad, wifi_ssid,
+                                                       wifi_password)):
             self.log.error("WiFi connect failed")
             return False
         # simulate normal user behavior -- wake up every 1 minutes and do ping
@@ -303,11 +298,12 @@
         if not phone_idle_iwlan(self.log, ad):
             self.log.error("DUT not in WFC enabled state.")
             return False
-        if not call_setup_teardown(self.log,
-                                   ad,
-                                   self.android_devices[1],
-                                   ad_hangup=None,
-                                   verify_caller_func=is_phone_in_call_iwlan):
+        if not call_setup_teardown(
+                self.log,
+                ad,
+                self.android_devices[1],
+                ad_hangup=None,
+                verify_caller_func=is_phone_in_call_iwlan):
             self.log.error("Setup Call failed.")
             return False
         ad.droid.goToSleepNow()
@@ -555,8 +551,8 @@
         Pass criteria info should be in test config file.
         """
         try:
-            PASS_CRITERIA = int(self.user_params[
-                "pass_criteria_idle_baseline"]["pass_criteria"])
+            PASS_CRITERIA = int(self.user_params["pass_criteria_idle_baseline"]
+                                ["pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
 
@@ -600,7 +596,8 @@
                 self.log.error("Phone failed to turn on airplane mode.")
                 return False
             if not ensure_wifi_connected(self.log, ad,
-                self.wifi_network_ssid_2g, self.wifi_network_pass_2g):
+                                         self.wifi_network_ssid_2g,
+                                         self.wifi_network_pass_2g):
                 self.log.error("WiFi connect failed")
                 return False
             ad.droid.goToSleepNow()
@@ -897,10 +894,11 @@
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
         # TODO: b/26338146 need a SL4A API to clear all existing alarms.
 
-        result = self._test_power_idle("test_power_idle_3g_wakeup_ping",
-                                       self._setup_phone_idle_and_wakeup_ping,
-                                       PASS_CRITERIA,
-                                       phone_setup_func=phone_setup_voice_3g)
+        result = self._test_power_idle(
+            "test_power_idle_3g_wakeup_ping",
+            self._setup_phone_idle_and_wakeup_ping,
+            PASS_CRITERIA,
+            phone_setup_func=phone_setup_voice_3g)
         return result
 
     # TODO: This one is not working right now. Requires SL4A API to start alarm.
@@ -911,11 +909,12 @@
                 "pass_criteria_mobile_data_always_on_lte"]["pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
-        result = self._test_power_idle("test_power_mobile_data_always_on_lte",
-                                       self._setup_phone_mobile_data_always_on,
-                                       PASS_CRITERIA,
-                                       phone_setup_func=phone_setup_csfb,
-                                       connect_wifi=False)
+        result = self._test_power_idle(
+            "test_power_mobile_data_always_on_lte",
+            self._setup_phone_mobile_data_always_on,
+            PASS_CRITERIA,
+            phone_setup_func=phone_setup_csfb,
+            connect_wifi=False)
         set_mobile_data_always_on(self.ad, False)
         return result
 
@@ -927,11 +926,12 @@
                 "pass_criteria_mobile_data_always_on_wcdma"]["pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
-        result = self._test_power_idle("test_power_mobile_data_always_on_wcdma",
-                                       self._setup_phone_mobile_data_always_on,
-                                       PASS_CRITERIA,
-                                       phone_setup_func=phone_setup_voice_3g,
-                                       connect_wifi=False)
+        result = self._test_power_idle(
+            "test_power_mobile_data_always_on_wcdma",
+            self._setup_phone_mobile_data_always_on,
+            PASS_CRITERIA,
+            phone_setup_func=phone_setup_voice_3g,
+            connect_wifi=False)
         set_mobile_data_always_on(self.ad, False)
         return result
 
@@ -943,11 +943,12 @@
                 "pass_criteria_mobile_data_always_on_1xevdo"]["pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
-        result = self._test_power_idle("test_power_mobile_data_always_on_1xevdo",
-                                       self._setup_phone_mobile_data_always_on,
-                                       PASS_CRITERIA,
-                                       phone_setup_func=phone_setup_voice_3g,
-                                       connect_wifi=False)
+        result = self._test_power_idle(
+            "test_power_mobile_data_always_on_1xevdo",
+            self._setup_phone_mobile_data_always_on,
+            PASS_CRITERIA,
+            phone_setup_func=phone_setup_voice_3g,
+            connect_wifi=False)
         set_mobile_data_always_on(self.ad, False)
         return result
 
@@ -959,11 +960,12 @@
                 "pass_criteria_mobile_data_always_on_gsm"]["pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
-        result = self._test_power_idle("test_power_mobile_data_always_on_gsm",
-                                       self._setup_phone_mobile_data_always_on,
-                                       PASS_CRITERIA,
-                                       phone_setup_func=phone_setup_voice_2g,
-                                       connect_wifi=False)
+        result = self._test_power_idle(
+            "test_power_mobile_data_always_on_gsm",
+            self._setup_phone_mobile_data_always_on,
+            PASS_CRITERIA,
+            phone_setup_func=phone_setup_voice_2g,
+            connect_wifi=False)
         set_mobile_data_always_on(self.ad, False)
         return result
 
@@ -973,7 +975,7 @@
         try:
             PASS_CRITERIA = int(self.user_params[
                 "pass_criteria_mobile_data_always_on_lte_wifi_on"][
-                "pass_criteria"])
+                    "pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
         result = self._test_power_idle(
@@ -993,7 +995,7 @@
         try:
             PASS_CRITERIA = int(self.user_params[
                 "pass_criteria_mobile_data_always_on_wcdma_wifi_on"][
-                "pass_criteria"])
+                    "pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
         result = self._test_power_idle(
@@ -1013,7 +1015,7 @@
         try:
             PASS_CRITERIA = int(self.user_params[
                 "pass_criteria_mobile_data_always_on_1xevdo_wifi_on"][
-                "pass_criteria"])
+                    "pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
         result = self._test_power_idle(
@@ -1033,7 +1035,7 @@
         try:
             PASS_CRITERIA = int(self.user_params[
                 "pass_criteria_mobile_data_always_on_gsm_wifi_on"][
-                "pass_criteria"])
+                    "pass_criteria"])
         except KeyError:
             PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
         result = self._test_power_idle(