mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Update web-platform-tests to revision 2b66b8b24b727c7490bf6091dd8a6a551642720b
This commit is contained in:
parent
b0751f4241
commit
faf92483da
85 changed files with 1096 additions and 220 deletions
|
@ -1,7 +1,7 @@
|
|||
marionette_driver==2.7.0
|
||||
mozprofile==2.2.0
|
||||
mozprocess==1.0.0
|
||||
mozcrash == 1.0
|
||||
mozcrash==1.1.0
|
||||
mozrunner==7.3.0
|
||||
mozleak==0.2
|
||||
mozinstall==2.0.0
|
||||
|
|
|
@ -146,7 +146,7 @@ class FennecBrowser(FirefoxBrowser):
|
|||
"network.preload": True})
|
||||
if self.test_type == "reftest":
|
||||
self.logger.info("Setting android reftest preferences")
|
||||
self.profile.set_preferences({"browser.viewport.desktopWidth": 600,
|
||||
self.profile.set_preferences({"browser.viewport.desktopWidth": 800,
|
||||
# Disable high DPI
|
||||
"layout.css.devPixelsPerPx": "1.0",
|
||||
# Ensure that the full browser element
|
||||
|
|
|
@ -87,6 +87,7 @@ def browser_kwargs(test_type, run_info_data, config, **kwargs):
|
|||
"stylo_threads": kwargs["stylo_threads"],
|
||||
"chaos_mode_flags": kwargs["chaos_mode_flags"],
|
||||
"config": config,
|
||||
"browser_channel": kwargs["browser_channel"],
|
||||
"headless": kwargs["headless"]}
|
||||
|
||||
|
||||
|
@ -187,7 +188,7 @@ class FirefoxBrowser(Browser):
|
|||
symbols_path=None, stackwalk_binary=None, certutil_binary=None,
|
||||
ca_certificate_path=None, e10s=False, lsan_dir=None, stackfix_dir=None,
|
||||
binary_args=None, timeout_multiplier=None, leak_check=False, asan=False,
|
||||
stylo_threads=1, chaos_mode_flags=None, config=None, headless=None, **kwargs):
|
||||
stylo_threads=1, chaos_mode_flags=None, config=None, browser_channel="nightly", headless=None, **kwargs):
|
||||
Browser.__init__(self, logger)
|
||||
self.binary = binary
|
||||
self.prefs_root = prefs_root
|
||||
|
@ -224,6 +225,7 @@ class FirefoxBrowser(Browser):
|
|||
self.lsan_handler = None
|
||||
self.stylo_threads = stylo_threads
|
||||
self.chaos_mode_flags = chaos_mode_flags
|
||||
self.browser_channel = browser_channel
|
||||
self.headless = headless
|
||||
|
||||
def settings(self, test):
|
||||
|
@ -326,7 +328,10 @@ class FirefoxBrowser(Browser):
|
|||
if os.path.isfile(profiles):
|
||||
with open(profiles, 'r') as fh:
|
||||
for name in json.load(fh)['web-platform-tests']:
|
||||
pref_paths.append(os.path.join(self.prefs_root, name, 'user.js'))
|
||||
if self.browser_channel in (None, 'nightly'):
|
||||
pref_paths.append(os.path.join(self.prefs_root, name, 'user.js'))
|
||||
elif name != 'unittest-features':
|
||||
pref_paths.append(os.path.join(self.prefs_root, name, 'user.js'))
|
||||
else:
|
||||
# Old preference files used before the creation of profiles.json (remove when no longer supported)
|
||||
legacy_pref_paths = (
|
||||
|
|
|
@ -868,7 +868,9 @@ class InternalRefTestImplementation(object):
|
|||
{"test": self.executor.test_url(test),
|
||||
"references": references,
|
||||
"expected": test.expected(),
|
||||
"timeout": timeout})["value"]
|
||||
"timeout": timeout,
|
||||
"width": 800,
|
||||
"height": 600})["value"]
|
||||
return rv
|
||||
|
||||
def get_references(self, node):
|
||||
|
|
|
@ -372,7 +372,7 @@ class SeleniumRefTestExecutor(RefTestExecutor):
|
|||
"""return [window.outerWidth - window.innerWidth,
|
||||
window.outerHeight - window.innerHeight];"""
|
||||
)
|
||||
self.protocol.webdriver.set_window_rect(0, 0, 600 + width_offset, 600 + height_offset)
|
||||
self.protocol.webdriver.set_window_rect(0, 0, 800 + width_offset, 600 + height_offset)
|
||||
|
||||
result = self.implementation.run_test(test)
|
||||
|
||||
|
|
|
@ -209,7 +209,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
|
|||
for pref, value in test.environment.get('prefs', {}).iteritems():
|
||||
command += ["--pref", "%s=%s" % (pref, value)]
|
||||
|
||||
command += ["--resolution", viewport_size or "600x600"]
|
||||
command += ["--resolution", viewport_size or "800x600"]
|
||||
|
||||
if self.browser.ca_certificate_path:
|
||||
command += ["--certificate-path", self.browser.ca_certificate_path]
|
||||
|
|
|
@ -406,7 +406,7 @@ class WebDriverRefTestExecutor(RefTestExecutor):
|
|||
window.outerHeight - window.innerHeight];"""
|
||||
)
|
||||
self.protocol.webdriver.window.position = (0, 0)
|
||||
self.protocol.webdriver.window.size = (600 + width_offset, 600 + height_offset)
|
||||
self.protocol.webdriver.window.size = (800 + width_offset, 600 + height_offset)
|
||||
|
||||
result = self.implementation.run_test(test)
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
var win = window.open("about:blank", "test", "left=0,top=0,width=600,height=600");
|
||||
var win = window.open("about:blank", "test", "left=0,top=0,width=800,height=600");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue