Bug 1367465 - Fix log message when setting selinux mode on Android fails r?bc draft
authorWilliam Lachance <wlachance@mozilla.com>
Wed, 24 May 2017 11:26:59 -0400
changeset 583752 cabbecd2cbca869d10c32aa81ecaf69c913a3332
parent 583751 1a735bdbbfa9a11e78b7e977d45cf00af85e7b66
child 583762 735783f2886d5943b2ceb4a879b688df877af170
child 583775 372544706f3239466fcdddcb8b0331f5be317fc2
push id60526
push userwlachance@mozilla.com
push dateWed, 24 May 2017 15:27:19 +0000
reviewersbc
bugs1367465
milestone55.0a1
Bug 1367465 - Fix log message when setting selinux mode on Android fails r?bc MozReview-Commit-ID: LvLfujDcGfU
testing/mozbase/mozdevice/mozdevice/adb_android.py
--- a/testing/mozbase/mozdevice/mozdevice/adb_android.py
+++ b/testing/mozbase/mozdevice/mozdevice/adb_android.py
@@ -86,17 +86,17 @@ class ADBAndroid(ADBDevice):
         # getenforce returns either Enforcing or Permissive
 
         try:
             self.selinux = True
             if self.shell_output('getenforce', timeout=timeout) != 'Permissive':
                 self._logger.info('Setting SELinux Permissive Mode')
                 self.shell_output("setenforce Permissive", timeout=timeout, root=True)
         except (ADBError, ADBRootError), e:
-            self._logger.warning('Unable to set SELinux Permissive due to %s.', e)
+            self._logger.warning('Unable to set SELinux Permissive due to %s.' % e)
             self.selinux = False
 
         self.version = int(self.shell_output("getprop ro.build.version.sdk",
                                              timeout=timeout))
 
     def reboot(self, timeout=None):
         """Reboots the device.