Suppress two WebGL conformance failures on Mac 10.9 with Intel HD 3000 GPU.

Required exposing new Mac versions to Telemetry's test expectations.
Added unit test.

BUG=417415

Review URL: https://codereview.chromium.org/597383002

Cr-Commit-Position: refs/heads/master@{#296634}

content/test/gpu/gpu_tests/context_lost_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/gpu_process_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations as expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/hardware_accelerated_feature_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations as expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/maps_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/memory_test_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/pixel_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/screenshot_sync_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations as expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

@@ -8,7 +8,7 @@ from telemetry.page import test_expectations
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
-#     linux, chromeos, android
+#     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,
@@ -76,6 +76,12 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
     self.Fail('conformance/ogles/GL/operators/operators_009_to_016.html',
         ['mountainlion', ('intel', 0x116)], bug=322795)
 
+    # Mac 10.9 / Intel HD 3000 failures
+    self.Fail('conformance/ogles/GL/operators/operators_009_to_016.html',
+        ['mavericks', ('intel', 0x116)], bug=417415)
+    self.Fail('conformance/rendering/gl-scissor-test.html',
+        ['mavericks', ('intel', 0x116)], bug=417415)
+
     # Mac Retina failures
     self.Fail(
         'conformance/glsl/bugs/array-of-struct-with-int-first-position.html',

tools/telemetry/telemetry/page/test_expectations.py

@@ -6,7 +6,7 @@ import fnmatch
 
 OS_MODIFIERS = ['win', 'xp', 'vista', 'win7',
                 'mac', 'leopard', 'snowleopard', 'lion', 'mountainlion',
-                'linux', 'chromeos', 'android']
+                'mavericks', 'yosemite', 'linux', 'chromeos', 'android']
 GPU_MODIFIERS = ['amd', 'arm', 'broadcom', 'hisilicon', 'intel', 'imagination',
                  'nvidia', 'qualcomm', 'vivante']
 CONFIG_MODIFIERS = ['debug', 'release']

tools/telemetry/telemetry/page/test_expectations_unittest.py

@@ -59,6 +59,9 @@ class SampleTestExpectations(test_expectations.TestExpectations):
     self.Fail('page9.html', ['imagination'])
     self.Fail('page10.html', [('imagination', 'PowerVR SGX 554')])
     self.Fail('Pages.page_11')
+    self.Fail('page12.html', ['mountainlion'])
+    self.Fail('page13.html', ['mavericks'])
+    self.Fail('page14.html', ['yosemite'])
 
 class TestExpectationsTest(unittest.TestCase):
   def setUp(self):
@@ -189,3 +192,30 @@ class TestExpectationsTest(unittest.TestCase):
     page = page_module.Page('http://test.com/page11.html', ps,
                             name='Pages.page_11')
     self.assertExpectationEquals('fail', page)
+
+  # Verify version-specific Mac expectations.
+  def testMacVersionExpectations(self):
+    ps = page_set.PageSet()
+    page = page_module.Page('http://test.com/page12.html', ps)
+    self.assertExpectationEquals('fail', page,
+                                 StubPlatform('mac', 'mountainlion'))
+    self.assertExpectationEquals('pass', page,
+                                 StubPlatform('mac', 'mavericks'))
+    self.assertExpectationEquals('pass', page,
+                                 StubPlatform('mac', 'yosemite'))
+    ps = page_set.PageSet()
+    page = page_module.Page('http://test.com/page13.html', ps)
+    self.assertExpectationEquals('pass', page,
+                                 StubPlatform('mac', 'mountainlion'))
+    self.assertExpectationEquals('fail', page,
+                                 StubPlatform('mac', 'mavericks'))
+    self.assertExpectationEquals('pass', page,
+                                 StubPlatform('mac', 'yosemite'))
+    ps = page_set.PageSet()
+    page = page_module.Page('http://test.com/page14.html', ps)
+    self.assertExpectationEquals('pass', page,
+                                 StubPlatform('mac', 'mountainlion'))
+    self.assertExpectationEquals('pass', page,
+                                 StubPlatform('mac', 'mavericks'))
+    self.assertExpectationEquals('fail', page,
+                                 StubPlatform('mac', 'yosemite'))