Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: tools/telemetry/telemetry/unittest/run_tests.py

Issue 134623006: Allow disabled tests on cros to be run with -d flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unittest
Patch Set: Created 6 years, 11 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/unittest/run_tests.py
diff --git a/tools/telemetry/telemetry/unittest/run_tests.py b/tools/telemetry/telemetry/unittest/run_tests.py
index c4f2e216c8f592ecf3667f04075a1151666fecbc..51f57a71629c79f6c3b8458762edc9d4130ebeb7 100644
--- a/tools/telemetry/telemetry/unittest/run_tests.py
+++ b/tools/telemetry/telemetry/unittest/run_tests.py
@@ -70,11 +70,11 @@ def DiscoverAndRunTests(
logging.debug('Skipping test %s because it requires %s' %
(test.id(), types))
return False
- if hasattr(method, '_disabled_test'):
- if not run_disabled_tests:
- return False
- if (hasattr(method, '_disabled_test_on_cros') and
- cros_interface.IsRunningOnCrosDevice()):
+
+ if (not run_disabled_tests and
+ (hasattr(method, '_disabled_test') or
+ (hasattr(method, '_disabled_test_on_cros') and
+ cros_interface.IsRunningOnCrosDevice()))):
return False
return True
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698