Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(722)

Unified Diff: content/test/gpu/gpu_tests/test_expectations_unittest.py

Issue 2632603002: Add support for ASAN-specific test expectations to WebGL tests. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/gpu/gpu_tests/test_expectations_unittest.py
diff --git a/content/test/gpu/gpu_tests/test_expectations_unittest.py b/content/test/gpu/gpu_tests/test_expectations_unittest.py
index 6a916248add1ad92bdeee5e329fed6eed8d5a9c5..facf4d74b64cfa317e2187786d46d295482ea2b4 100644
--- a/content/test/gpu/gpu_tests/test_expectations_unittest.py
+++ b/content/test/gpu/gpu_tests/test_expectations_unittest.py
@@ -44,6 +44,10 @@ class SampleExpectationSubclass(test_expectations.Expectation):
class SampleTestExpectations(test_expectations.TestExpectations):
+ def __init__(self, url_prefixes=None, is_asan=False):
+ super(SampleTestExpectations, self).__init__(
+ url_prefixes=url_prefixes, is_asan=is_asan)
+
def CreateExpectation(self, expectation, url_pattern, conditions=None,
bug=None):
return SampleExpectationSubclass(expectation, url_pattern,
@@ -70,6 +74,12 @@ class SampleTestExpectations(test_expectations.TestExpectations):
# Explicitly matched paths have precedence over wildcards.
self.Fail('conformance/glsl/*')
self.Skip('conformance/glsl/page15.html')
+ # Test ASAN expectations.
+ self.Fail('page16.html', ['mac', 'asan'])
+ self.Fail('page17.html', ['mac', 'no_asan'])
+ # Explicitly specified ASAN expectations should not collide.
+ self.Skip('page18.html', ['mac', 'asan'])
+ self.Fail('page18.html', ['mac', 'no_asan'])
def _ExpectationAppliesToTest(
self, expectation, browser, test_url, test_name):
@@ -93,10 +103,13 @@ class FailingAbsoluteTestExpectations(test_expectations.TestExpectations):
self.Fail('http://test.com/page5.html', bug=123)
class TestExpectationsTest(unittest.TestCase):
- def setUp(self):
+ def setUpHelper(self, is_asan=False):
self.expectations = SampleTestExpectations(url_prefixes=[
'third_party/webgl/src/sdk/tests/',
- 'content/test/data/gpu'])
+ 'content/test/data/gpu'], is_asan=is_asan)
+
+ def setUp(self):
+ self.setUpHelper()
def assertExpectationEquals(self, expected, url, platform=StubPlatform(''),
browser_type=None):
@@ -237,3 +250,21 @@ class TestExpectationsTest(unittest.TestCase):
'third_party\\webgl\\src\\sdk\\tests\\conformance\\glsl\\foo.html',
'Foo',
StubPlatform('win'))
+
+ def testCaseInsensitivity(self):
+ url = 'http://test.com/page1.html'
+ self.assertExpectationEquals('fail', url, StubPlatform('Win'))
+ url = 'http://test.com/page2.html'
+ self.assertExpectationEquals('fail', url, StubPlatform('Win', 'Vista'))
+ url = 'http://test.com/page10.html'
+ self.assertExpectationEquals('fail', url, StubPlatform('android'),
+ browser_type='Android-Webview-Shell')
+
+ def testASANExpectations(self):
+ url16 = 'page16.html'
+ url18 = 'page18.html'
+ self.assertExpectationEquals('pass', url16, StubPlatform('mac'))
+ self.assertExpectationEquals('fail', url18, StubPlatform('mac'))
+ self.setUpHelper(is_asan=True)
+ self.assertExpectationEquals('fail', url16, StubPlatform('mac'))
+ self.assertExpectationEquals('skip', url18, StubPlatform('mac'))
« no previous file with comments | « content/test/gpu/gpu_tests/test_expectations.py ('k') | content/test/gpu/gpu_tests/webgl2_conformance_expectations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698