WebGL2: Update Windows test expectations.

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index 2745c1ca1a9c62e2f515b589a920f4693a8dbe4d..cc2da2e036173376c0e942ef0a8accbe8ae671f1 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -30,6 +30,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # ========================
 
     # All platforms.
+    self.Fail('deqp/functional/gles3/fboinvalidate/whole.html', bug=624506)

[Zhenyao Mo, 2016/07/12 17:52:01]

This is passing on Mac.

 
     # Too slow (take about one hour to run)
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
@@ -68,40 +69,41 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win'], bug=617817)
 
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturelod.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturelodoffset.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojlod.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojlodoffset.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturegrad.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturegradoffset.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgrad.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgradoffset.html',
-        ['win'], bug=483282)
+        ['win'], bug=627531)
 
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
-    self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
-        ['win'], bug=483282)
 
-    self.Fail('deqp/functional/gles3/fbomultisample*',
-        ['win'], bug=483282)
+    self.Flaky('deqp/functional/gles3/transformfeedback/*.html',
+        ['win'], bug=626068)
 
+    # ANGLE bug id
+    self.Fail('deqp/functional/gles3/fbomultisample*',
+        ['win'], bug=1246)
     self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
-        ['win'], bug=483282)
-    self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
-        ['win'], bug=624506)
+        ['win'], bug=1246)
+    self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
+        ['win'], bug=1268)
 
     # Windows 8 only.
 
@@ -114,8 +116,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'nvidia'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_05.html',
         ['win', 'nvidia'], bug=483282)
-    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', 'nvidia'], bug=483282)
 
     # Win / AMD
     self.Fail('deqp/functional/gles3/texturespecification/' +
@@ -141,9 +141,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', ('amd', 0x6779)], bug=483282)
 
-    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', ('amd', 0x6779)], bug=483282)
-
     # It's unfortunate that this suppression needs 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.
@@ -200,8 +197,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/2d_array_*.html',
         ['win', 'intel'], bug=483282)
-    self.Flaky('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', 'intel'], bug=626068)
 
     # Mac only.
     self.Flaky('deqp/functional/gles3/shaderindexing/varying.html',
@@ -511,8 +506,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_cube.html',
         ['linux'], bug=483282)
-    self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
-        ['linux'], bug=624506)
 
     self.Fail('deqp/data/gles3/shaders/functions.html',
         ['linux', 'amd', 'intel'], bug=483282)