Chromium Code Reviews| Index: build/android/devil/android/device_utils_test.py |
| diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py |
| index ec641e9748606e354d9ec2867afbe962a16d3b10..2fc2a01a6c19c68029658710f2d24d2951216d23 100755 |
| --- a/build/android/devil/android/device_utils_test.py |
| +++ b/build/android/devil/android/device_utils_test.py |
| @@ -7,25 +7,19 @@ |
| Unit tests for the contents of device_utils.py (mostly DeviceUtils). |
| """ |
| -# pylint: disable=C0321 |
| -# pylint: disable=W0212 |
| -# pylint: disable=W0613 |
| +# pylint: disable=protected-access |
| +# pylint: disable=unused-argument |
| -import collections |
| -import datetime |
| import logging |
| import os |
| -import re |
| import sys |
| import unittest |
| -from devil.android import device_blacklist |
| from devil.android import device_errors |
| from devil.android import device_signal |
| from devil.android import device_utils |
| from devil.android.sdk import adb_wrapper |
| from devil.android.sdk import intent |
| -from devil.android.sdk import split_select |
| from devil.android.sdk import version_codes |
| from devil.utils import cmd_helper |
| from devil.utils import mock_calls |
| @@ -1610,7 +1604,7 @@ class DeviceUtilsWriteFileTest(DeviceUtilsTest): |
| self.device.WriteFile('/test/file/to write', 'the contents') |
| def testWriteFile_withEchoAndSU(self): |
| - expected_cmd_without_su = "sh -c 'echo -n contents > /test/file'" |
| + expected_cmd_without_su = "sh -c 'echo -n contents > /test/file'" |
| expected_cmd = 'su -c %s' % expected_cmd_without_su |
| with self.assertCalls( |
| (self.call.device.NeedsSU(), True), |
| @@ -1963,6 +1957,7 @@ class DeviceUtilsClientCache(DeviceUtilsTest): |
| class DeviceUtilsHealthyDevicesTest(mock_calls.TestCase): |
| + # pylint: disable=no-self-use |
| def _createAdbWrapperMock(self, serial, is_ready=True): |
|
perezju
2015/09/04 09:01:53
why is this a method?
jbudorick
2015/09/04 16:51:56
removed entirely
|
| adb = _AdbWrapperMock(serial) |
| adb.is_ready = is_ready |
| @@ -2001,7 +1996,7 @@ class DeviceUtilsRestartAdbdTest(DeviceUtilsTest): |
| self.adb, suffix='.sh'), MockTempFile(mock_temp_file)), |
| self.call.device.WriteFile(mock.ANY, mock.ANY), |
| (self.call.device.RunShellCommand( |
| - ['source', mock_temp_file ], as_root=True)), |
| + ['source', mock_temp_file], as_root=True)), |
| self.call.adb.WaitForDevice()): |
| self.device.RestartAdbd() |