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

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

Issue 132923002: Disable unit tests that fail on cros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@oobe
Patch Set: rebase 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 | « tools/telemetry/telemetry/unittest/__init__.py ('k') | 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 85010839982c017c7caa48bd81ca0a672adcae6b..c4f2e216c8f592ecf3667f04075a1151666fecbc 100644
--- a/tools/telemetry/telemetry/unittest/run_tests.py
+++ b/tools/telemetry/telemetry/unittest/run_tests.py
@@ -7,6 +7,7 @@ import unittest
from telemetry.core import browser_options
from telemetry.core import discover
from telemetry.core import util
+from telemetry.core.backends.chrome import cros_interface
from telemetry.unittest import gtest_testrunner
from telemetry.unittest import options_for_unittests
@@ -72,6 +73,9 @@ def DiscoverAndRunTests(
if hasattr(method, '_disabled_test'):
if not run_disabled_tests:
return False
+ if (hasattr(method, '_disabled_test_on_cros') and
+ cros_interface.IsRunningOnCrosDevice()):
+ return False
return True
« no previous file with comments | « tools/telemetry/telemetry/unittest/__init__.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698