GPU test expectations: more precisely detect ANGLE

content/test/gpu/gpu_tests/gpu_test_expectations_unittest.py

 # Copyright 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.
 import unittest
 
 from telemetry.internal.platform import system_info
 from telemetry.page import page as page_module
 from telemetry.story import story_set
 
 from gpu_tests import gpu_test_expectations
@@ skipping 45 matching lines @@
 
 class SampleTestExpectations(gpu_test_expectations.GpuTestExpectations):
   def SetExpectations(self):
     # Test GPU conditions.
     self.Fail('test1.html', ['nvidia', 'intel'], bug=123)
     self.Fail('test2.html', [('nvidia', 0x1001), ('nvidia', 0x1002)], bug=123)
     self.Fail('test3.html', ['win', 'intel', ('amd', 0x1001)], bug=123)
     self.Fail('test4.html', ['imagination'])
     self.Fail('test5.html', [('imagination', 'PowerVR SGX 554')])
     # Test ANGLE conditions.
-    self.Fail('test6.html', ['win', 'd3d9'], bug=345)
+    self.Fail('test6-1.html', ['win', 'd3d9'], bug=345)
+    self.Fail('test6-2.html', ['opengl'], bug=345)
+    self.Fail('test6-3.html', ['no_angle'], bug=345)
     # Test flaky expectations.
     self.Flaky('test7.html', bug=123, max_num_retries=5)
     self.Flaky('test8.html', ['win'], bug=123, max_num_retries=6)
     self.Flaky('wildcardtest*.html', ['win'], bug=123, max_num_retries=7)
 
 class GpuTestExpectationsTest(unittest.TestCase):
   def setUp(self):
     self.expectations = SampleTestExpectations()
 
   def assertExpectationEquals(self, expected, page, platform=StubPlatform(''),
@@ skipping 71 matching lines @@
     self.assertExpectationEquals('pass', page,
                                  vendor_string=VENDOR_STRING_IMAGINATION,
                                  device_string='Triangle Monster 3000')
     self.assertExpectationEquals('pass', page,
                                  vendor_string='Acme',
                                  device_string=DEVICE_STRING_SGX)
 
   # Test ANGLE conditions.
   def testANGLEConditions(self):
     ps = story_set.StorySet()
-    page = page_module.Page('http://test.com/test6.html', ps)
+    page = page_module.Page('http://test.com/test6-1.html', ps)
     self.assertExpectationEquals('pass', page, StubPlatform('win'),
-                                 gl_renderer='Direct3D11')
+                                 gl_renderer='ANGLE Direct3D11')
     self.assertExpectationEquals('fail', page, StubPlatform('win'),
-                                 gl_renderer='Direct3D9')
+                                 gl_renderer='ANGLE Direct3D9')
+
+    # Regression test for a native mac GL_RENDERER string matching
+    # an ANGLE expectation.
+    page = page_module.Page('http://test.com/test6-2.html', ps)
+    self.assertExpectationEquals('pass', page, StubPlatform('mac'),
+                                 gl_renderer='Mac Something OpenGL')
+    self.assertExpectationEquals('fail', page, StubPlatform('win'),
+                                 gl_renderer='ANGLE OpenGL')
+
+    # Tests for the no_angle keyword
+    page = page_module.Page('http://test.com/test6-3.html', ps)
+    self.assertExpectationEquals('fail', page, StubPlatform('mac'),
+                                 gl_renderer='Mac Something OpenGL')
+    self.assertExpectationEquals('pass', page, StubPlatform('win'),
+                                 gl_renderer='ANGLE OpenGL')
 
   # Ensure retry mechanism is working.
   def testFlakyExpectation(self):
     ps = story_set.StorySet()
     page = page_module.Page('http://test.com/test7.html', ps)
     self.assertExpectationEquals('flaky', page)
     self.assertEquals(5, self.getRetriesForPage(page))
 
   # Ensure the filtering from the TestExpectations superclass still works.
   def testFlakyPerPlatformExpectation(self):
     ps = story_set.StorySet()
     page1 = page_module.Page('http://test.com/test8.html', ps)
     self.assertExpectationEquals('flaky', page1, StubPlatform('win'))
     self.assertEquals(6, self.getRetriesForPage(page1, StubPlatform('win')))
     self.assertExpectationEquals('pass', page1, StubPlatform('mac'))
     self.assertEquals(0, self.getRetriesForPage(page1, StubPlatform('mac')))
     page2 = page_module.Page('http://test.com/wildcardtest1.html', ps)
     self.assertExpectationEquals('flaky', page2, StubPlatform('win'))
     self.assertEquals(7, self.getRetriesForPage(page2, StubPlatform('win')))
     self.assertExpectationEquals('pass', page2, StubPlatform('mac'))
     self.assertEquals(0, self.getRetriesForPage(page2, StubPlatform('mac')))