diff options
| -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, |