Index: tools/telemetry/telemetry/internal/platform/android_platform_backend_unittest.py |
diff --git a/tools/telemetry/telemetry/internal/platform/android_platform_backend_unittest.py b/tools/telemetry/telemetry/internal/platform/android_platform_backend_unittest.py |
index 7030e82156acbb0b155545d91e457d8861b67a0a..91425512b977a349f083ede509b37cca2c328fd5 100644 |
--- a/tools/telemetry/telemetry/internal/platform/android_platform_backend_unittest.py |
+++ b/tools/telemetry/telemetry/internal/platform/android_platform_backend_unittest.py |
@@ -32,11 +32,6 @@ class AndroidPlatformBackendTest(unittest.TestCase): |
def get_prop(name, cache=None): |
return {'ro.product.cpu.abi': 'armeabi-v7a'}.get(name) |
- self.setup_prebuilt_tool_patcher = mock.patch( |
- 'telemetry.internal.platform.android_platform_backend._SetupPrebuiltTools') # pylint: disable=line-too-long |
- m = self.setup_prebuilt_tool_patcher.start() |
- m.return_value = True |
- |
self.device_patcher = mock.patch.multiple( |
device_utils.DeviceUtils, |
HasRoot=mock.MagicMock(return_value=True), |
@@ -47,7 +42,6 @@ class AndroidPlatformBackendTest(unittest.TestCase): |
self._stubs.Restore() |
android_platform_backend.psutil = self._actual_ps_util |
self.battery_patcher.stop() |
- self.setup_prebuilt_tool_patcher.stop() |
self.device_patcher.stop() |
@decorators.Disabled('chromeos') |
@@ -177,19 +171,10 @@ class AndroidPlatformBackendPsutilTest(unittest.TestCase): |
self.battery_patcher = mock.patch.object(battery_utils, 'BatteryUtils') |
self.battery_patcher.start() |
self._actual_ps_util = android_platform_backend.psutil |
- self.setup_prebuilt_tool_patcher = mock.patch( |
- 'telemetry.internal.platform.android_platform_backend._SetupPrebuiltTools') # pylint: disable=line-too-long |
- m = self.setup_prebuilt_tool_patcher.start() |
- m.return_value = True |
def get_prop(name, cache=None): |
return {'ro.product.cpu.abi': 'armeabi-v7a'}.get(name) |
- self.helper_patcher = mock.patch( |
- 'telemetry.internal.platform.android_platform_backend._SetupPrebuiltTools', # pylint: disable=line-too-long |
- return_value=True) |
- self.helper_patcher.start() |
- |
self.device_patcher = mock.patch.multiple( |
device_utils.DeviceUtils, |
FileExists=mock.MagicMock(return_value=False), |
@@ -202,8 +187,6 @@ class AndroidPlatformBackendPsutilTest(unittest.TestCase): |
android_platform_backend.psutil = self._actual_ps_util |
self.battery_patcher.stop() |
self.device_patcher.stop() |
- self.helper_patcher.stop() |
- self.setup_prebuilt_tool_patcher.stop() |
@decorators.Disabled('chromeos') |
def testPsutil1(self): |