tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py - Issue 797003002: Replaced @benchmark.Enabled/Disabled and @test.Enabled/Disabled with @decorators.Enabled/Disabled i…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

Issue 797003002: Replaced @benchmark.Enabled/Disabled and @test.Enabled/Disabled with @decorators.Enabled/Disabled i… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed some bad imports Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/telemetry/telemetry/core/browser_unittest.py ('k') | tools/telemetry/telemetry/core/platform/cros_interface_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c103026f2facddbbb241276a5cf9b2b1bd9b81f8..43e9f72f72f3185a3d80ad039eba60dcdffa1102 100644

--- a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

@@ -4,7 +4,7 @@

import unittest

-from telemetry import benchmark

+from telemetry import decorators

from telemetry.core.platform import android_device

from telemetry.core.platform import android_platform_backend

from telemetry.unittest_util import system_stub

@@ -25,7 +25,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):

self._stubs.Restore()

android_platform_backend.psutil = self._actual_ps_util

- @benchmark.Disabled('chromeos')

+ @decorators.Disabled('chromeos')

def testGetCpuStats(self):

proc_stat_content = [

'7702 (.android.chrome) S 167 167 0 0 -1 1077936448 '

@@ -41,7 +41,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):

cpu_stats = backend.GetCpuStats('7702')

self.assertEquals(cpu_stats, {'CpuProcessTime': 0.05})

- @benchmark.Disabled('chromeos')

+ @decorators.Disabled('chromeos')

def testGetCpuStatsInvalidPID(self):

# Mock an empty /proc/pid/stat.

backend = android_platform_backend.AndroidPlatformBackend(