Reenable IOSurface Canvas2D. Disable new trace tests.

content/test/gpu/page_sets/pixel_tests.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 telemetry.story import story_set as story_set_module
 
 import sys
 
 from gpu_tests import gpu_test_base
 
@@ skipping 53 matching lines @@
     # On OS X, test the IOSurface 2D Canvas compositing path.
     if sys.platform.startswith('darwin'):
       self.AddStory(PixelTestsPage(
         url='file://../../data/gpu/pixel_canvas2d_accelerated.html',
         name=base_name + '.IOSurface2DCanvas',
         test_rect=[0, 0, 400, 400],
         revision=1,
         story_set=self,
         shared_page_state_class=IOSurface2DCanvasSharedPageState,
         expectations=expectations))
-      self.AddStory(PixelTestsPage(
-        url='file://../../data/gpu/pixel_canvas2d_webgl.html',
-        name=base_name + '.IOSurface2DCanvasWebGL',
-        test_rect=[0, 0, 400, 400],
-        revision=1,
-        story_set=self,
-        shared_page_state_class=IOSurface2DCanvasSharedPageState,
-        expectations=expectations))
+      # Temporarily disable test to look for source of
+      # trace_test.IOSurface2DCanvas failures. https://crbug.com/595754.

[Ken Russell (switch to Gerrit), 2016/03/19 04:27:04]

Could you skip this test instead in
src/content/test/gpu/gpu_tests/trace_test_expectations.py ? That would allow the
pixel test to continue to run.

[erikchen, 2016/03/21 19:45:03]

I skipped the test in trace_test.py, since I want the test to not run, not just
fail.

+      #self.AddStory(PixelTestsPage(
+      #  url='file://../../data/gpu/pixel_canvas2d_webgl.html',
+      #  name=base_name + '.IOSurface2DCanvasWebGL',
+      #  test_rect=[0, 0, 400, 400],
+      #  revision=1,
+      #  story_set=self,
+      #  shared_page_state_class=IOSurface2DCanvasSharedPageState,
+      #  expectations=expectations))
 
   def _AddAllPages(self, expectations, base_name, use_es3):
     if use_es3:
       es3_suffix = 'ES3'
       shared_page_state_class = PixelTestsES3SharedPageState
     else:
       es3_suffix = ''
       shared_page_state_class = gpu_test_base.GpuSharedPageState
 
     self.AddStory(PixelTestsPage(
@@ skipping 26 matching lines @@
     self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_scissor.html',
       name=base_name + '.ScissorTestWithPreserveDrawingBuffer' + es3_suffix,
       test_rect=[0, 0, 300, 300],
       revision=0, # This is not used.
       story_set=self,
       shared_page_state_class=shared_page_state_class,
       expectations=expectations,
       expected_colors='../../data/gpu/pixel_scissor_expectations.json'))
 
-    self.AddStory(PixelTestsPage(
-      url='file://../../data/gpu/pixel_canvas2d_webgl.html',
-      name=base_name + '.2DCanvasWebGL',
-      test_rect=[0, 0, 400, 400],
-      revision=1,
-      story_set=self,
-      shared_page_state_class=shared_page_state_class,
-      expectations=expectations))
+    # Temporarily disable test to look for source of
+    # trace_test.IOSurface2DCanvas failures. https://crbug.com/595754.

[Ken Russell (switch to Gerrit), 2016/03/19 04:27:04]

Same here.

+    #self.AddStory(PixelTestsPage(
+    #  url='file://../../data/gpu/pixel_canvas2d_webgl.html',
+    #  name=base_name + '.2DCanvasWebGL',
+    #  test_rect=[0, 0, 400, 400],
+    #  revision=1,
+    #  story_set=self,
+    #  shared_page_state_class=shared_page_state_class,
+    #  expectations=expectations))
 
   @property
   def allow_mixed_story_states(self):
     # Return True here in order to be able to add the same tests with
     # a different SharedPageState on Mac which tests them with the
     # Core Profile rendering path.
     return True