tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py - Issue 1428133005: [Telemetry] Allows concatenating multiple Disabled & Enabled decorators

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/internal/backends/chrome/cros_unittest.py

Issue 1428133005: [Telemetry] Allows concatenating multiple Disabled & Enabled decorators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Dave's comment Created 5 years, 1 month 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/decorators_unittest.py ('k') | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py

diff --git a/tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py

index 7529fa061edf0552c97c46ff19c1df9b63de5a94..607567f39f39d0fe9da3cddaab58297df488c2c2 100644

--- a/tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py

+++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py

@@ -65,7 +65,7 @@ class CrOSLoginTest(cros_test_case.CrOSTestCase):

pass

util.WaitFor(lambda: not self._IsCryptohomeMounted(), 20)

- @decorators.Disabled

+ @decorators.Disabled('all')

def testGaiaLogin(self):

"""Tests gaia login. Credentials are expected to be found in a

credentials.txt file, with a single line of format username:password."""

@@ -152,7 +152,7 @@ class CrOSScreenLockerTest(cros_test_case.CrOSTestCase):

util.WaitFor(lambda: not browser.oobe_exists, 10)

self.assertFalse(self._IsScreenLocked(browser))

- @decorators.Disabled

+ @decorators.Disabled('all')

def testScreenLock(self):

"""Tests autotestPrivate.screenLock"""

if self._is_guest: