WebGL: Update AMD test expectations.

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 51 matching lines @@
     self.Flaky('deqp/functional/gles3/fbomultisample*',
         ['win', 'nvidia'], bug=631317)
 
     # Win / AMD
 
     # Fail on all AMD configurations
     self.Fail('deqp/functional/gles3/textureshadow/2d*',
         ['win', 'amd'], bug=638323)
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', 'amd'], bug=638323)
+    self.Fail('deqp/functional/gles3/texturespecification/' +
+        'texstorage2d_format_depth_stencil.html',
+        ['win', 'amd'], bug=614178)
+    self.Fail('deqp/functional/gles3/texturespecification/' +
+        'texstorage3d_format_depth_stencil.html',
+        ['win', 'amd'], bug=614178)
+    self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
+        ['win', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
+        ['win', 'amd'], bug=483282)
 
     # Failing on old R5 230 configuration.
-    self.Fail('deqp/functional/gles3/texturespecification/' +
-        'texstorage2d_format_depth_stencil.html',
-        ['win', ('amd', 0x6779)], bug=614178)
-    self.Fail('deqp/functional/gles3/texturespecification/' +
-        'texstorage3d_format_depth_stencil.html',
-        ['win', ('amd', 0x6779)], bug=614178)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
-        ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', ('amd', 0x6779)], bug=483282)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
-        ['win', ('amd', 0x6779)], bug=483282)
 
     self.Fail('deqp/functional/gles3/transformfeedback/*',
         ['win', ('amd', 0x6779)], bug=626068)
 
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fbomultisample.8_samples.html',
         ['win', ('amd', 0x6779)], bug=483282)
 
     # Keep a separate set of failures for the R7 240, since it can use a new
     # and updated driver. The older drivers won't ever get fixes from AMD.
     self.Fail('deqp/functional/gles3/framebufferblit/depth_stencil.html',
         ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
-        ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/2d_array*',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/cube*',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturespecification/'
         'teximage2d_depth.html',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturespecification/'
-        'texstorage2d_format_depth_stencil.html',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturespecification/'
-        'texstorage3d_format_depth_stencil.html',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturespecification/'
         'texsubimage2d_depth.html',
         ['win', ('amd', 0x6613)], bug=638323)
 
     # It's unfortunate that these suppressions need to be so broad, but
     # basically any test that uses readPixels is potentially flaky, and
     # it's infeasible to suppress individual failures one by one.
     self.Flaky('conformance/*', ['win', ('amd', 0x6779)], bug=491419)
     self.Flaky('conformance2/*', ['win', ('amd', 0x6779)], bug=491419)
     self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419)
 
@@ skipping 769 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'])