[Android] Fix new pylint errors in build/android/.

build/android/pylib/device/device_utils_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=C0321
@@ skipping 479 matching lines @@
           ("adb -s 0123456789abcdef shell 'pm path this.is.a.test.package'",
            ''),
           ("adb -s 0123456789abcdef install /fake/test/app.apk",
            'Success\r\n')]):
         self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_differentPriorInstall(self):
     def mockGetFilesChanged(host_path, device_path, ignore_filenames):
       return [(host_path, device_path)]
 
-    # Pylint raises a false positive "operator not preceded by a space"
-    # warning below.
-    # pylint: disable=C0322
     with mock.patch('os.path.isfile', return_value=True), (
          mock.patch('os.path.exists', return_value=True)), (
          mock.patch('pylib.utils.apk_helper.GetPackageName',
                     return_value='this.is.a.test.package')), (
          mock.patch('pylib.constants.GetOutDirectory',
                     return_value='/fake/test/out')), (
          mock.patch('pylib.android_commands.AndroidCommands.GetFilesChanged',
                     side_effect=mockGetFilesChanged)):
-    # pylint: enable=C0322
       with self.assertCallsSequence([
           ("adb -s 0123456789abcdef shell 'pm path this.is.a.test.package'",
            'package:/fake/data/app/this.is.a.test.package.apk\r\n'),
           # GetFilesChanged is mocked, so its adb calls are omitted.
           ('adb -s 0123456789abcdef uninstall this.is.a.test.package',
            'Success\r\n'),
           ('adb -s 0123456789abcdef install /fake/test/app.apk',
            'Success\r\n')]):
         self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_differentPriorInstall_reinstall(self):
     def mockGetFilesChanged(host_path, device_path, ignore_filenames):
       return [(host_path, device_path)]
 
-    # Pylint raises a false positive "operator not preceded by a space"
-    # warning below.
-    # pylint: disable=C0322
     with mock.patch('os.path.isfile', return_value=True), (
          mock.patch('pylib.utils.apk_helper.GetPackageName',
                     return_value='this.is.a.test.package')), (
          mock.patch('pylib.constants.GetOutDirectory',
                     return_value='/fake/test/out')), (
          mock.patch('pylib.android_commands.AndroidCommands.GetFilesChanged',
                     side_effect=mockGetFilesChanged)):
-    # pylint: enable=C0322
       with self.assertCallsSequence([
           ("adb -s 0123456789abcdef shell 'pm path this.is.a.test.package'",
            'package:/fake/data/app/this.is.a.test.package.apk\r\n'),
           # GetFilesChanged is mocked, so its adb calls are omitted.
           ('adb -s 0123456789abcdef install -r /fake/test/app.apk',
            'Success\r\n')]):
         self.device.Install('/fake/test/app.apk', reinstall=True, retries=0)
 
   def testInstall_identicalPriorInstall(self):
     def mockGetFilesChanged(host_path, device_path, ignore_filenames):
@@ skipping 667 matching lines @@
 
     mock_file = mock.MagicMock(spec=file)
     mock_file.name = '/tmp/file/to.be.pushed'
     mock_file.__enter__.return_value = mock_file
     with mock.patch('tempfile.NamedTemporaryFile',
                     return_value=mock_file):
       with self.assertCallsSequence(
           cmd_ret=[
               # Create temporary contents file
               (r"adb -s 0123456789abcdef shell "
-                  "'test -e \"/fake/storage/path/temp_file-\d+-\d+\"; "
-                  "echo \$\?'",
+                  r"'test -e \"/fake/storage/path/temp_file-\d+-\d+\"; "
+                  r"echo \$\?'",
                '1\r\n'),
               # Create temporary script file
               (r"adb -s 0123456789abcdef shell "
-                  "'test -e \"/fake/storage/path/temp_file-\d+-\d+\.sh\"; "
-                  "echo \$\?'",
+                  r"'test -e \"/fake/storage/path/temp_file-\d+-\d+\.sh\"; "
+                  r"echo \$\?'",
                '1\r\n'),
               # Set contents file
               (r'adb -s 0123456789abcdef push /tmp/file/to\.be\.pushed '
-                  '/fake/storage/path/temp_file-\d+\d+',
+                  r'/fake/storage/path/temp_file-\d+\d+',
                '100 B/s (100 bytes in 1.000s)\r\n'),
               # Set script file
               (r'adb -s 0123456789abcdef push /tmp/file/to\.be\.pushed '
-                  '/fake/storage/path/temp_file-\d+\d+',
+                  r'/fake/storage/path/temp_file-\d+\d+',
                '100 B/s (100 bytes in 1.000s)\r\n'),
               # Call script
               (r"adb -s 0123456789abcdef shell "
-                  "'sh /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
+                  r"'sh /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
               # Remove device temporaries
               (r"adb -s 0123456789abcdef shell "
-                  "'rm /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
+                  r"'rm /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
               (r"adb -s 0123456789abcdef shell "
-                  "'rm /fake/storage/path/temp_file-\d+-\d+'", '')],
+                  r"'rm /fake/storage/path/temp_file-\d+-\d+'", '')],
           comp=re.match):
         self.device.WriteFile('/test/file/written.to.device',
                               'new test file contents', as_root=True)
 
   def testWriteFile_asRoot_withSu(self):
     self.device.old_interface._external_storage = '/fake/storage/path'
     self.device.old_interface._privileged_command_runner = (
         self.device.old_interface.RunShellCommandWithSU)
     self.device.old_interface._protected_file_access_method_initialized = True
 
     mock_file = mock.MagicMock(spec=file)
     mock_file.name = '/tmp/file/to.be.pushed'
     mock_file.__enter__.return_value = mock_file
     with mock.patch('tempfile.NamedTemporaryFile',
                     return_value=mock_file):
       with self.assertCallsSequence(
           cmd_ret=[
               # Create temporary contents file
               (r"adb -s 0123456789abcdef shell "
-                  "'test -e \"/fake/storage/path/temp_file-\d+-\d+\"; "
-                  "echo \$\?'",
+                  r"'test -e \"/fake/storage/path/temp_file-\d+-\d+\"; "
+                  r"echo \$\?'",
                '1\r\n'),
               # Create temporary script file
               (r"adb -s 0123456789abcdef shell "
-                  "'test -e \"/fake/storage/path/temp_file-\d+-\d+\.sh\"; "
-                  "echo \$\?'",
+                  r"'test -e \"/fake/storage/path/temp_file-\d+-\d+\.sh\"; "
+                  r"echo \$\?'",
                '1\r\n'),
               # Set contents file
               (r'adb -s 0123456789abcdef push /tmp/file/to\.be\.pushed '
-                  '/fake/storage/path/temp_file-\d+\d+',
+                  r'/fake/storage/path/temp_file-\d+\d+',
                '100 B/s (100 bytes in 1.000s)\r\n'),
               # Set script file
               (r'adb -s 0123456789abcdef push /tmp/file/to\.be\.pushed '
-                  '/fake/storage/path/temp_file-\d+\d+',
+                  r'/fake/storage/path/temp_file-\d+\d+',
                '100 B/s (100 bytes in 1.000s)\r\n'),
               # Call script
               (r"adb -s 0123456789abcdef shell "
-                  "'su -c sh /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
+                  r"'su -c sh /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
               # Remove device temporaries
               (r"adb -s 0123456789abcdef shell "
-                  "'rm /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
+                  r"'rm /fake/storage/path/temp_file-\d+-\d+\.sh'", ''),
               (r"adb -s 0123456789abcdef shell "
-                  "'rm /fake/storage/path/temp_file-\d+-\d+'", '')],
+                  r"'rm /fake/storage/path/temp_file-\d+-\d+'", '')],
           comp=re.match):
         self.device.WriteFile('/test/file/written.to.device',
                               'new test file contents', as_root=True)
 
   def testWriteFile_asRoot_rejected(self):
     self.device.old_interface._privileged_command_runner = None
     self.device.old_interface._protected_file_access_method_initialized = True
     with self.assertRaises(device_errors.CommandFailedError):
       self.device.WriteFile('/test/file/no.permissions.to.write',
                             'new test file contents', as_root=True)
@@ skipping 323 matching lines @@
     self.device = device_utils.DeviceUtils(None)
     with self.assertCalls('adb  get-serialno', 'unknown'), (
          self.assertRaises(device_errors.NoDevicesError)):
       str(self.device)
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)