| Index: content/test/gpu/gpu_tests/test_expectations.py
|
| diff --git a/content/test/gpu/gpu_tests/test_expectations.py b/content/test/gpu/gpu_tests/test_expectations.py
|
| index 7a70439e066c440ffb386f8730f4d37fb1eb931d..d8aa932cc9bd5e368e560616df5c5c07141e23c6 100644
|
| --- a/content/test/gpu/gpu_tests/test_expectations.py
|
| +++ b/content/test/gpu/gpu_tests/test_expectations.py
|
| @@ -27,7 +27,7 @@ OS_CONDITIONS = ['win', 'mac', 'linux', 'chromeos', 'android'] + \
|
| WIN_CONDITIONS + MAC_CONDITIONS
|
|
|
| BROWSER_TYPE_CONDITIONS = [
|
| - 'android-webview-shell', 'android-content-shell', 'debug', 'release' ]
|
| + 'android-webview-shell', 'android-content-shell', 'debug', 'release']
|
|
|
| class Expectation(object):
|
| """Represents a single test expectation for a page.
|
| @@ -142,11 +142,11 @@ class TestExpectations(object):
|
| self._skip_matching_names = True
|
| for e in self._expectations:
|
| if self.ExpectationAppliesToPage(e, browser, page):
|
| - if (self._HasWildcardCharacters(e.pattern)):
|
| + if self._HasWildcardCharacters(e.pattern):
|
| self._expectations_with_wildcards.append(e)
|
| else:
|
| if e.pattern in self._expectations_by_pattern:
|
| - print "WARNING: Non-wildcard pattern collision for", pattern
|
| + print "WARNING: Non-wildcard pattern collision for", e.pattern
|
| self._expectations_by_pattern[e.pattern] = e
|
| self._built_expectation_cache = True
|
| self._skip_matching_names = False
|
| @@ -168,7 +168,7 @@ class TestExpectations(object):
|
| url_path = components[2]
|
| # Chop any leading slash since the expectations used by this class
|
| # assume that.
|
| - if (url_path and url_path[0] == '/'):
|
| + if url_path and url_path[0] == '/':
|
| url_path = url_path[1:]
|
| # Python's urlsplit doesn't seem to handle query arguments for
|
| # file:// URLs properly. Split them off manually.
|
|
|