Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-16 10:55:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support device-pixel-ratio in wpt reftests.

Browse source
This commit is contained in:
Ms2ger 2016-01-12 12:07:19 +01:00
parent 6beebd3b4f
commit 198ee0f2c6
10 changed files with 72 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/wpt/harness/wptrunner/executors/base.py
View file

@ -206,12 +206,12 @@ class RefTestImplementation(object):
def logger(self):
return self.executor.logger
def get_hash(self, test, viewport_size):
def get_hash(self, test, viewport_size, dpi):
timeout = test.timeout * self.timeout_multiplier
key = (test.url, viewport_size)
key = (test.url, viewport_size, dpi)
if key not in self.screenshot_cache:
success, data = self.executor.screenshot(test, viewport_size)
success, data = self.executor.screenshot(test, viewport_size, dpi)
if not success:
return False, data
@ -236,6 +236,7 @@ class RefTestImplementation(object):
def run_test(self, test):
viewport_size = test.viewport_size
dpi = test.dpi
self.message = []
# Depth-first search of reference tree, with the goal
@ -249,7 +250,7 @@ class RefTestImplementation(object):
nodes, relation = stack.pop()
for i, node in enumerate(nodes):
success, data = self.get_hash(node, viewport_size)
success, data = self.get_hash(node, viewport_size, dpi)
if success is False:
return {"status": data[0], "message": data[1]}
@ -266,7 +267,7 @@ class RefTestImplementation(object):
for i, (node, screenshot) in enumerate(zip(nodes, screenshots)):
if screenshot is None:
success, screenshot = self.retake_screenshot(node, viewport_size)
success, screenshot = self.retake_screenshot(node, viewport_size, dpi)
if success:
screenshots[i] = screenshot
@ -277,12 +278,12 @@ class RefTestImplementation(object):
"message": "\n".join(self.message),
"extra": {"reftest_screenshots": log_data}}
def retake_screenshot(self, node, viewport_size):
success, data = self.executor.screenshot(node, viewport_size)
def retake_screenshot(self, node, viewport_size, dpi):
success, data = self.executor.screenshot(node, viewport_size, dpi)
if not success:
return False, data
key = (node.url, viewport_size)
key = (node.url, viewport_size, dpi)
hash_val, _ = self.screenshot_cache[key]
self.screenshot_cache[key] = hash_val, data
return True, data