Moves screenshot_sync tests onto the new test expectations format

Bug: chromium:698902
Change-Id: Ic2963f13439db4176e9650e6f111e42dbcc753d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548377Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#646589}

content/test/gpu/gpu_tests/screenshot_sync_expectations.py

-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from gpu_tests.gpu_test_expectations import GpuTestExpectations
-
-# See the GpuTestExpectations class for documentation.
-
-class ScreenshotSyncExpectations(GpuTestExpectations):
-  def __init__(self, *args, **kwargs):
-    super(ScreenshotSyncExpectations, self).__init__(*args, **kwargs)
-
-  def SetExpectations(self):
-    self.Flaky('ScreenshotSync_GPURasterWithCanvas', ['win', 'amd'],
-               bug=599776)
-    self.Flaky('ScreenshotSync_GPURasterWithCanvas', ['mac', 'intel'],
-               bug=599776)
-    self.Flaky('ScreenshotSync_GPURasterWithDivs', ['mac', 'intel'],
-               bug=599776)
-    self.Fail('ScreenshotSync_GPURasterWithDivs', ['win', ('amd', 0x6613)],
-               bug=639489)
-    # TODO(kbr): flakily timing out on this configuration.
-    self.Flaky('*', ['linux', 'intel', 'debug'], bug=648369)

content/test/gpu/gpu_tests/screenshot_sync_integration_test.py

@@ -10,7 +10,6 @@ import sys
 from gpu_tests import color_profile_manager
 from gpu_tests import gpu_integration_test
 from gpu_tests import path_util
-from gpu_tests import screenshot_sync_expectations
 
 from telemetry.util import image_util
 from telemetry.util import rgba_color
@@ -74,7 +73,7 @@ class ScreenshotSyncIntegrationTest(gpu_integration_test.GpuIntegrationTest):
 
   @classmethod
   def _CreateExpectations(cls):
-    return screenshot_sync_expectations.ScreenshotSyncExpectations()
+    raise NotImplementedError
 
   @classmethod
   def GenerateGpuTests(cls, options):
@@ -145,6 +144,13 @@ class ScreenshotSyncIntegrationTest(gpu_integration_test.GpuIntegrationTest):
     for _ in range(0, repetitions):
       self._CheckScreenshot()
 
+  @classmethod
+  def ExpectationsFiles(cls):
+    return [
+        os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                     'test_expectations',
+                     'screenshot_sync_expectations.txt')]
+
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])

content/test/gpu/gpu_tests/test_expectations/screenshot_sync_expectations.txt

+# tags: [ linux mac win ]
+# tags: [ debug ]
+# tags: [ amd amd-0x6613 intel ]
+
+crbug.com/599776 [ win amd ] ScreenshotSync_GPURasterWithCanvas [ RetryOnFailure ]
+crbug.com/599776 [ mac intel ] ScreenshotSync_GPURasterWithCanvas [ RetryOnFailure ]
+crbug.com/599776 [ mac intel ] ScreenshotSync_GPURasterWithDivs [ RetryOnFailure ]
+crbug.com/639489 [ win amd-0x6613 ] ScreenshotSync_GPURasterWithDivs [ Failure ]
+
+# TODO(kbr): flakily timing out on this configuration.
+crbug.com/648369 [ linux debug intel ] * [ RetryOnFailure ]