diff options
| author | kbr <kbr@chromium.org> | 2015-12-09 22:51:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 06:52:34 +0000 |
| commit | 34f722f157a6318525aa77817289937c0b5bb368 (patch) | |
| tree | 644ccfaee6cf036e16386ee410fbc6152298e643 | |
| parent | 811bba14d61d93ceec0f19bdbef758714251974f (diff) | |
| download | chromium_src-34f722f157a6318525aa77817289937c0b5bb368.zip chromium_src-34f722f157a6318525aa77817289937c0b5bb368.tar.gz chromium_src-34f722f157a6318525aa77817289937c0b5bb368.tar.bz2 | |
Skip the screenshot_sync test properly.
Use test expectations instead of the benchmark.Disabled annotation.
Signal a non-zero exit code from
run_telemetry_benchmark_as_googletest.py when the target script produces
no output. This will allow recipes to detect this failure case more
automatically.
BUG=459820,561863
R=dpranke@chromium.org
TBR=bajones@chromium.org,nednguyen@google.com
Review URL: https://codereview.chromium.org/1513943002
Cr-Commit-Position: refs/heads/master@{#364304}
| -rw-r--r-- | content/test/gpu/gpu_tests/screenshot_sync.py | 2 | ||||
| -rw-r--r-- | content/test/gpu/gpu_tests/screenshot_sync_expectations.py | 2 | ||||
| -rwxr-xr-x | testing/scripts/run_telemetry_benchmark_as_googletest.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/content/test/gpu/gpu_tests/screenshot_sync.py b/content/test/gpu/gpu_tests/screenshot_sync.py index c62865c..caa3853 100644 --- a/content/test/gpu/gpu_tests/screenshot_sync.py +++ b/content/test/gpu/gpu_tests/screenshot_sync.py @@ -8,7 +8,6 @@ from gpu_tests import gpu_test_base from gpu_tests import path_util from gpu_tests import screenshot_sync_expectations -from telemetry import benchmark from telemetry.page import page_test from telemetry.story import story_set as story_set_module from telemetry.util import image_util @@ -55,7 +54,6 @@ class ScreenshotSyncPage(gpu_test_base.PageBase): expectations=expectations) -@benchmark.Disabled('linux', 'mac', 'win') class ScreenshotSyncProcess(gpu_test_base.TestBase): """Tests that screenhots are properly synchronized with the frame one which they were requested""" diff --git a/content/test/gpu/gpu_tests/screenshot_sync_expectations.py b/content/test/gpu/gpu_tests/screenshot_sync_expectations.py index 44f8e06..07ec586 100644 --- a/content/test/gpu/gpu_tests/screenshot_sync_expectations.py +++ b/content/test/gpu/gpu_tests/screenshot_sync_expectations.py @@ -11,4 +11,4 @@ class ScreenshotSyncExpectations(GpuTestExpectations): super(ScreenshotSyncExpectations, self).__init__(*args, **kwargs) def SetExpectations(self): - pass + self.Skip('ScreenshotSync', ['win', 'mac', 'linux'], bug=459820) diff --git a/testing/scripts/run_telemetry_benchmark_as_googletest.py b/testing/scripts/run_telemetry_benchmark_as_googletest.py index 5715422..39af8f0 100755 --- a/testing/scripts/run_telemetry_benchmark_as_googletest.py +++ b/testing/scripts/run_telemetry_benchmark_as_googletest.py @@ -80,6 +80,9 @@ def main(): if not valid and not failures: failures = ['(entire test suite)'] + if rc == 0: + rc = 1 # Signal an abnormal exit. + json.dump({ 'valid': valid, 'failures': failures, |