Update WebGL2 conformance test expectations for Linux bots.

content/test/gpu/gpu_tests/webgl2_conformance_expectations.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.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 50 matching lines @@
     self.Skip('deqp/functional/gles3/texturewrap.html', bug=483282)
     self.Skip('deqp/functional/gles3/transformfeedback.html', bug=483282)
     self.Skip('deqp/functional/gles3/uniformapi.html', bug=483282)
     self.Skip('deqp/functional/gles3/uniformbuffers.html', bug=483282)
     self.Skip('deqp/functional/gles3/vertexarrays.html', bug=483282)
 
     self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282)
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
 
     self.Fail('conformance2/misc/expando-loss-2.html', bug=483282)
-
+    self.Fail('conformance2/reading/read-pixels-from-fbo-test.html', bug=483282)
     self.Fail('conformance2/vertex_arrays/vertex-array-object.html', bug=483282)
 
     self.Fail('conformance2/textures/image_bitmap_from_image/' +
         'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
         'r8-red-unsigned_byte.html',
         bug=595097)
     self.Fail('conformance2/textures/image_bitmap_from_image/' +
         'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
         'r16f-red-half_float.html',
         bug=595097)
@@ skipping 224 matching lines @@
 
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win'], bug=587601)
 
     self.Skip('deqp/functional/gles3/readpixel.html', ['win'], bug=483282)
     self.Skip('deqp/functional/gles3/texturestatequery.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['win'], bug=483282)
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
-    self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
-        ['win'], bug=483282)
     self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['win'], bug=483282)
     self.Skip('conformance2/textures/misc/tex-mipmap-levels.html',
         ['win'], bug=483282)
     self.Skip('conformance2/transform_feedback/transform_feedback.html',
         ['win'], bug=483282)
@@ skipping 235 matching lines @@
     self.Fail('conformance2/renderbuffers/invalidate-framebuffer.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/renderbuffers/readbuffer.html',
         ['mac'], bug=570453)
     self.Fail('conformance2/textures/misc/copy-texture-image.html',
         ['mac'], bug=577144)
     self.Fail('conformance2/textures/misc/tex-storage-and-subimage-3d.html',
         ['mac'], bug=483282)
-    # The following failure is 10.10 only, but we don't have a keyword yet.
-    self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
-        ['mac'], bug=584994)
     self.Fail('conformance2/state/gl-object-get-calls.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/textures/image_bitmap_from_image/*',
         ['mac'], bug=589930)
 
     # Mac Retina NVIDIA
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     # Mac AMD
     self.Fail('deqp/functional/gles3/clipping.html',
         ['mac', 'amd'], bug=483282)
 
     # Mac Intel
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['mac', 'intel'], bug=483282)
 
     # Linux only.
+    self.Fail('deqp/functional/gles3/fbostatequery.html',
+        ['linux'], bug=483282)
+    self.Flaky('deqp/functional/gles3/negativeshaderapi.html',
+        ['linux'], bug=483282)
     self.Skip('deqp/functional/gles3/shaderswitch.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['linux'], bug=483282)
-
-    self.Flaky('deqp/functional/gles3/negativeshaderapi.html',
+    self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['linux'], bug=483282)
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
     self.Skip('deqp/data/gles3/shaders/arrays.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/functional/gles3/texturestatequery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/buffers/buffer-type-restrictions.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/buffers/buffer-overflow-test.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/renderbuffers/framebuffer-texture-layer.html',
         ['linux', 'amd'], bug=295792)
     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
         ['linux', 'amd'], bug=295792)
 
     self.Fail('deqp/data/gles3/shaders/conversions.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/buffercopy.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/clipping.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/samplerobject.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/misc/uninitialized-test-2.html',
         ['linux', 'amd'], bug=483282)
-    self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
-        ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/reading/read-pixels-pack-parameters.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['linux', 'amd'], bug=483282)
 
     # Linux Intel: driver is GL 3.0 and doesn't support features needed for ES3.
     self.Skip('*', ['linux', 'intel'], bug=540543)
 
@@ skipping 54 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])