Reenable IOSurface Canvas2D. Disable new trace tests.

content/test/gpu/gpu_tests/trace_test.py

 # Copyright (c) 2015 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 import gpu_test_base
 from gpu_tests import trace_test_expectations
 import page_sets
 
 from telemetry.page import page_test
 from telemetry.timeline import model as model_module
 from telemetry.timeline import tracing_config
@@ skipping 69 matching lines @@
   def GetCategoryName(self):
     return TOPLEVEL_DEVICE_CATEGORY
 
 
 class TraceTestBase(gpu_test_base.TestBase):
   """Base class for the trace tests."""
   def CreateStorySet(self, options):
     # Utilize pixel tests page set as a set of simple pages to load.
     story_set = page_sets.PixelTestsStorySet(self.GetExpectations(),
                                              base_name=self.Name())
+
+    # Skip some stories as a temporary debugging measure.
+    # https://crbug.com/595754.
+    # stories = []
+    # for story in story_set.stories:
+    #   if '2DCanvasWebGL' not in story.display_name:
+    #     stories.append(story)
+    # story_set.stories = stories

[Ken Russell (switch to Gerrit), 2016/03/21 21:14:10]

This code is commented out? Don't see how it will have an effect.

To be clear, I'm suggesting making the following change in
src/content/test/gpu/gpu_tests/trace_test_expectations.py:

class TraceTestExpectations(GpuTestExpectations):
  def SetExpectations(self):
    self.Skip('TraceTest.IOSurface2DCanvasWebGL', ['mac'], bug=595754)
    self.Skip(TraceTest.2DCanvasWebGL', bug=595754)

[erikchen, 2016/03/21 21:27:52]

I didn't expect to be able to skip running a test from a method that sets
expectations for tests. I've followed your suggestion.

+
     for story in story_set:
       story.script_to_evaluate_on_commit = test_harness_script
     return story_set
 
 
 class TraceTest(TraceTestBase):
   """Tests GPU traces are plumbed through properly."""
   test = _TraceValidator
   name = 'TraceTest'
 
@@ skipping 12 matching lines @@
   """Tests GPU Device traces show up on devices that support it."""
   test = _DeviceTraceValidator
   name = 'DeviceTraceTest'
 
   @classmethod
   def Name(cls):
     return 'device_trace_test'
 
   def _CreateExpectations(self):
     return trace_test_expectations.DeviceTraceTestExpectations()