| Index: tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
|
| diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
|
| index 449fb798915d264fbbbb51dfe65ac9436f260b3d..43e9f72f72f3185a3d80ad039eba60dcdffa1102 100644
|
| --- a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
|
| +++ b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
|
| @@ -8,12 +8,10 @@
|
| from telemetry.core.platform import android_device
|
| from telemetry.core.platform import android_platform_backend
|
| from telemetry.unittest_util import system_stub
|
| -from telemetry.unittest_util import options_for_unittests
|
|
|
|
|
| class AndroidPlatformBackendTest(unittest.TestCase):
|
| def setUp(self):
|
| - self._options = options_for_unittests.GetCopy()
|
| self._stubs = system_stub.Override(
|
| android_platform_backend,
|
| ['perf_control', 'thermal_throttle', 'adb_commands', 'certutils',
|
| @@ -39,7 +37,7 @@
|
| old_interface = self._stubs.adb_commands.adb_device.old_interface
|
| old_interface.can_access_protected_file_contents = True
|
| backend = android_platform_backend.AndroidPlatformBackend(
|
| - android_device.AndroidDevice('12345'), self._options)
|
| + android_device.AndroidDevice('12345'))
|
| cpu_stats = backend.GetCpuStats('7702')
|
| self.assertEquals(cpu_stats, {'CpuProcessTime': 0.05})
|
|
|
| @@ -47,7 +45,7 @@
|
| def testGetCpuStatsInvalidPID(self):
|
| # Mock an empty /proc/pid/stat.
|
| backend = android_platform_backend.AndroidPlatformBackend(
|
| - android_device.AndroidDevice('1234'), self._options)
|
| + android_device.AndroidDevice('1234'))
|
| cpu_stats = backend.GetCpuStats('7702')
|
| self.assertEquals(cpu_stats, {})
|
|
|
| @@ -76,12 +74,12 @@
|
|
|
| def testInstallTestCaFailure(self):
|
| backend = android_platform_backend.AndroidPlatformBackend(
|
| - android_device.AndroidDevice('failure'), self._options)
|
| + android_device.AndroidDevice('failure'))
|
| backend.InstallTestCa()
|
| self.assertFalse(backend.is_test_ca_installed)
|
|
|
| def testInstallTestCaSuccess(self):
|
| backend = android_platform_backend.AndroidPlatformBackend(
|
| - android_device.AndroidDevice('success'), self._options)
|
| + android_device.AndroidDevice('success'))
|
| backend.InstallTestCa()
|
| self.assertTrue(backend.is_test_ca_installed)
|
|
|