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 |