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

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

Issue 2769063006: Add GPU integration pixel tests for VP9 and MP4 video. (Closed)
Patch Set: better Created 3 years, 9 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/pixel_integration_test.py
diff --git a/content/test/gpu/gpu_tests/pixel_integration_test.py b/content/test/gpu/gpu_tests/pixel_integration_test.py
index 83da9ab8b6565061d69772e9fd17b9dcdafbb966..6e308c6c117a2002eaaf0cd3c2148c230b6217f8 100644
--- a/content/test/gpu/gpu_tests/pixel_integration_test.py
+++ b/content/test/gpu/gpu_tests/pixel_integration_test.py
@@ -15,11 +15,14 @@ from gpu_tests import pixel_test_pages
from py_utils import cloud_storage
from telemetry.util import image_util
+root_data_path = os.path.abspath(os.path.join(
+ os.path.dirname(__file__), '..', '..', 'data'))
+gpu_data_dir = os.path.join(root_data_path, 'gpu')
-test_data_dir = os.path.abspath(os.path.join(
- os.path.dirname(__file__), '..', '..', 'data', 'gpu'))
+default_reference_image_dir = os.path.join(gpu_data_dir, 'gpu_reference')
-default_reference_image_dir = os.path.join(test_data_dir, 'gpu_reference')
+test_data_dirs = [gpu_data_dir,
+ os.path.join(root_data_path, 'media')]
test_harness_script = r"""
var domAutomationController = {};
@@ -68,7 +71,7 @@ class PixelIntegrationTest(
cls._original_finder_options = cls._finder_options.Copy()
cls.CustomizeBrowserArgs([])
cls.StartBrowser()
- cls.SetStaticServerDirs([test_data_dir])
+ cls.SetStaticServerDirs(test_data_dirs)
@classmethod
def CustomizeBrowserArgs(cls, browser_args):
@@ -119,7 +122,7 @@ class PixelIntegrationTest(
if sys.platform.startswith('darwin'):
pages += pixel_test_pages.MacSpecificPages(name)
for p in pages:
- yield(p.name, p.url, (p))
+ yield(p.name, "gpu/" + p.url, (p))
def RunActualGpuTest(self, test_path, *args):
page = args[0]

Powered by Google App Engine
This is Rietveld 408576698