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

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

Issue 1413883003: Add a presubmit script and pylintrc for content/test/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/webgl_conformance.py
diff --git a/content/test/gpu/gpu_tests/webgl_conformance.py b/content/test/gpu/gpu_tests/webgl_conformance.py
index 4e020464d2c45fa3973566fe1e6f34774eda1e07..392ca2bc053b2ab33b1c34431adb486e99b087fb 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance.py
@@ -1,19 +1,15 @@
# Copyright (c) 2012 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 json
-import optparse
import os
-import sys
-import gpu_test_base
-import path_util
-import webgl_conformance_expectations
-import webgl2_conformance_expectations
+from gpu_tests import gpu_test_base
+from gpu_tests import path_util
+from gpu_tests import webgl_conformance_expectations
+from gpu_tests import webgl2_conformance_expectations
from telemetry.internal.browser import browser_finder
from telemetry.page import page_test
-from telemetry.page import shared_page_state
from telemetry.story.story_set import StorySet
@@ -93,17 +89,17 @@ class WebglConformanceValidator(gpu_test_base.ValidatorBase):
])
browser = browser_finder.FindBrowser(options.finder_options)
if (browser.target_os.startswith('android') and
- browser.browser_type == 'android-webview-shell'):
- # TODO(kbr): this is overly broad. We'd like to do this only on
- # Nexus 9. It'll go away shortly anyway. crbug.com/499928
- #
- # The --ignore_egl_sync_failures is only there to work around
- # some strange failure on the Nexus 9 bot, not reproducible on
- # local hardware.
- options.AppendExtraBrowserArgs([
- '--disable-gl-extensions=GL_EXT_disjoint_timer_query',
- '--ignore_egl_sync_failures'
- ])
+ browser.browser_type == 'android-webview-shell'):
+ # TODO(kbr): this is overly broad. We'd like to do this only on
+ # Nexus 9. It'll go away shortly anyway. crbug.com/499928
+ #
+ # The --ignore_egl_sync_failures is only there to work around
+ # some strange failure on the Nexus 9 bot, not reproducible on
+ # local hardware.
+ options.AppendExtraBrowserArgs([
+ '--disable-gl-extensions=GL_EXT_disjoint_timer_query',
+ '--ignore_egl_sync_failures',
+ ])
class Webgl2ConformanceValidator(WebglConformanceValidator):
@@ -187,7 +183,7 @@ class WebglConformance(gpu_test_base.TestBase):
return ps
def _CreateExpectations(self):
- assert (self._webgl_version == 1 or self._webgl_version == 2)
+ assert self._webgl_version == 1 or self._webgl_version == 2
if self._webgl_version == 1:
return webgl_conformance_expectations.WebGLConformanceExpectations(
conformance_path)
@@ -234,9 +230,9 @@ class WebglConformance(gpu_test_base.TestBase):
_CompareVersion(version, min_version_to_compare) < 0):
continue
- if (webgl2_only and (not ('.txt' in test_name)) and
- ((not min_version_to_compare) or
- (not min_version_to_compare.startswith('2')))):
+ if (webgl2_only and not '.txt' in test_name and
+ (not min_version_to_compare or
+ not min_version_to_compare.startswith('2'))):
continue
if '.txt' in test_name:

Powered by Google App Engine
This is Rietveld 408576698