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

Update web-platform-tests to revision 9fc797e6e5fb7d244dfb5b5125886c01f8cedf2b

Browse source
This commit is contained in:
WPT Sync Bot 2019-02-05 21:00:19 -05:00
parent b7e9bab267
commit 6dda93c6e2
55 changed files with 646 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/wpt/web-platform-tests/CODEOWNERS
View file

@ -1,2 +1,5 @@
# Prevent accidentially touching CSS submodules
/css/tools/ @plinss @kojiishi @jgraham @gsnedders
# Prevent accidentially touching CSS subtree
/css/tools/apiclient/ @plinss @jgraham @gsnedders
# Prevent accidentally touching tools/third_party
/tools/third_party/ @jgraham @gsnedders

14
tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-005.html Normal file
View file

@ -0,0 +1,14 @@
<!DOCTYPE html>
<title>'border-image-repeat' with 'space' and 'round'</title>
<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#border-image-repeat">
<link rel="match" href="reference/border-image-repeat-005-ref.html">
<style>
#target {
width: 255px;
height: 80px;
border: 10px solid red;
border-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'><rect width='100' height='100' fill='green'/></svg>") 0 fill / 0px space round;
}
</style>
<p>There should be two green rectangles below:</p>
<div id="target"></div>

15
tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html>
<title>Reference: 'border-image-repeat' with 'space' and 'round'</title>
<style>
.green {
width: 100px;
height: 100px;
background-color: green;
position: absolute;
}
</style>
<p>There should be two green rectangles below:</p>
<div style="position: relative">
<div class="green" style="left: 25px"></div>
<div class="green" style="left: 150px"></div>
</div>

2
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html → tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<title>Test for font-display-late-swap feature policy</title>
<title>Test for font-display-late-swap feature policy behavior when set to reporting</title>
<style>
.ahem {
font-family: 'Ahem';

4
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html → tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html
View file

@ -1,8 +1,8 @@
<!DOCTYPE html>
<html class="reftest-wait">
<title>Test for font-display-late-swap feature policy</title>
<title>Test for font-display-late-swap feature policy behavior when set to reporting</title>
<link rel="help" href="https://github.com/w3c/webappsec-feature-policy/blob/master/policies/font-display-late-swap.md">
<link rel="match" href="font-display-feature-policy.tentative-ref.html">
<link rel="match" href="font-display-feature-policy-01.tentative-ref.html">
<style>
</style>
<p>Tests if font-display is set to optional for each option except for when it is set to fallback</p>

0
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html.headers → tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.headers
View file

29
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html Normal file
View file

@ -0,0 +1,29 @@
<!DOCTYPE html>
<title>Test for font-display-late-swap feature policy behavior when set to report-only</title>
<style>
.ahem {
font-family: 'Ahem';
}
.arial {
font-family: 'Arial';
}
</style>
<p>None of the font-display values should be changed</p>
<table id="container">
<tr>
<th>not-set</th>
<th>auto</th>
<th>block</th>
<th>swap</th>
<th>fallback</th>
<th>optional</th>
</tr>
<tr>
<td class="ahem">a</td>
<td class="ahem">a</td>
<td class="ahem">a</td>
<td class="ahem">a</td>
<td class="ahem">a</td>
<td class="arial">a</td>
</tr>
</table>

46
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html Normal file
View file

@ -0,0 +1,46 @@
<!DOCTYPE html>
<html class="reftest-wait">
<title>Test for font-display-late-swap feature policy behavior when set to report-only</title>
<link rel="help" href="https://github.com/w3c/webappsec-feature-policy/blob/master/policies/font-display-late-swap.md">
<link rel="match" href="font-display-feature-policy-02.tentative-ref.html">
<style>
</style>
<p>None of the font-display values should be changed</p>
<table id="container">
<tr>
<th>not-set</th>
<th>auto</th>
<th>block</th>
<th>swap</th>
<th>fallback</th>
<th>optional</th>
</tr>
</table>
<script>
const fontDisplayValues = ['', 'auto', 'block', 'swap', 'fallback', 'optional'];
const table = document.getElementById('container');
function makeFontFaceDeclaration(family, display) {
url = '/fonts/Ahem.ttf?pipe=trickle(d1)'; // Before the swap period is over
return '@font-face { font-family: ' + family + '; src: url("' + url + '"); font-display: ' + display + '; }';
}
window.onload = () => {
let tr = document.createElement('tr');
for (let display of fontDisplayValues) {
const family = display + '-face';
const rule = makeFontFaceDeclaration(family, display);
document.styleSheets[0].insertRule(rule, 0);
let td = document.createElement('td');
td.textContent = 'a';
td.style.fontFamily = family + ', Arial';
tr.appendChild(td);
}
table.appendChild(tr);
const timeoutMilliSec = 1500; // After the font is loaded
setTimeout(() => {
document.documentElement.classList.remove("reftest-wait");
}, timeoutMilliSec);
}
</script>
</html>

1
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers Normal file
View file

@ -0,0 +1 @@
Feature-Policy-Report-Only: font-display-late-swap 'none';

72
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html Normal file
View file

@ -0,0 +1,72 @@
<!DOCTYPE html>
<html>
<head>
<title>Test for font-display-late-swap feature policy set to report-only</title>
<link rel="help" href="https://w3c.github.io/webappsec-feature-policy/#reporting">
<script src='/resources/testharness.js'></script>
<script src='/resources/testharnessreport.js'></script>
<style>
</style>
</head>
<body>
<p>
Tests if the correct number of violation reports are generated and each report corresponds to this feature.
4 reports should be created out of the 6 options below (reports for all except for 'fallback' and 'optional').
</p>
<table id="container">
<tr>
<th>not-set</th>
<th>auto</th>
<th>block</th>
<th>swap</th>
<th>fallback</th>
<th>optional</th>
</tr>
</table>
<script>
const fontDisplayValues = ['', 'auto', 'block', 'swap', 'fallback', 'optional'];
const table = document.getElementById('container');
function makeFontFaceDeclaration(family, display) {
url = '/fonts/Ahem.ttf?pipe=trickle(d1)'; // Before the swap period is over
return '@font-face { font-family: ' + family + '; src: url("' + url + '"); font-display: ' + display + '; }';
}
window.onload = () => {
let tr = document.createElement('tr');
for (let display of fontDisplayValues) {
const family = display + '-face';
const rule = makeFontFaceDeclaration(family, display);
document.styleSheets[0].insertRule(rule, 0);
let td = document.createElement('td');
td.textContent = 'a';
td.style.fontFamily = family + ', Arial';
tr.appendChild(td);
}
table.appendChild(tr);
}
let reportCounter = 4;
let t = async_test('font-display-late-swap Report Format');
let check_report_format = (reports, observer) => {
reportCounter -= reports.length;
for (let report of reports) {
assert_equals(report.type, 'feature-policy-violation');
assert_equals(report.url, document.location.href, 'Report URL');
assert_equals(report.body.featureId, 'font-display-late-swap');
assert_equals(report.body.disposition, 'report');
assert_true('sourceFile' in report.body);
assert_true('lineNumber' in report.body);
assert_true('columnNumber' in report.body);
}
// Test is done when we have exactly 4 reports for the following
// font-display values: not set, 'auto', 'block', 'swap'
if (reportCounter == 0) t.done();
};
new ReportingObserver(t.step_func(check_report_format),
{types: ['feature-policy-violation'], buffered: true}).observe();
</script>
</body>
</html>

1
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.headers Normal file
View file

@ -0,0 +1 @@
Feature-Policy-Report-Only: font-display-late-swap 'none';

72
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html Normal file
View file

@ -0,0 +1,72 @@
<!DOCTYPE html>
<html>
<head>
<title>Test for font-display-late-swap feature policy set to reporting</title>
<link rel="help" href="https://w3c.github.io/webappsec-feature-policy/#reporting">
<script src='/resources/testharness.js'></script>
<script src='/resources/testharnessreport.js'></script>
<style>
</style>
</head>
<body>
<p>
Tests if the correct number of violation reports are generated and each report corresponds to this feature.
4 reports should be created out of the 6 options below (reports for all except for 'fallback' and 'optional').
</p>
<table id="container">
<tr>
<th>not-set</th>
<th>auto</th>
<th>block</th>
<th>swap</th>
<th>fallback</th>
<th>optional</th>
</tr>
</table>
<script>
const fontDisplayValues = ['', 'auto', 'block', 'swap', 'fallback', 'optional'];
const table = document.getElementById('container');
function makeFontFaceDeclaration(family, display) {
url = '/fonts/Ahem.ttf?pipe=trickle(d1)'; // Before the swap period is over
return '@font-face { font-family: ' + family + '; src: url("' + url + '"); font-display: ' + display + '; }';
}
window.onload = () => {
let tr = document.createElement('tr');
for (let display of fontDisplayValues) {
const family = display + '-face';
const rule = makeFontFaceDeclaration(family, display);
document.styleSheets[0].insertRule(rule, 0);
let td = document.createElement('td');
td.textContent = 'a';
td.style.fontFamily = family + ', Arial';
tr.appendChild(td);
}
table.appendChild(tr);
}
let reportCounter = 4;
let t = async_test('font-display-late-swap Report Format');
let check_report_format = (reports, observer) => {
reportCounter -= reports.length;
for (let report of reports) {
assert_equals(report.type, 'feature-policy-violation');
assert_equals(report.url, document.location.href, 'Report URL');
assert_equals(report.body.featureId, 'font-display-late-swap');
assert_equals(report.body.disposition, 'enforce');
assert_true('sourceFile' in report.body);
assert_true('lineNumber' in report.body);
assert_true('columnNumber' in report.body);
}
// Test is done when we have exactly 4 reports for the following
// font-display values: not set, 'auto', 'block', 'swap'
if (reportCounter == 0) t.done();
};
new ReportingObserver(t.step_func(check_report_format),
{types: ['feature-policy-violation'], buffered: true}).observe();
</script>
</body>
</html>

1
tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.headers Normal file
View file

@ -0,0 +1 @@
Feature-Policy: font-display-late-swap 'none';

7
tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
import os
import textwrap
@ -474,13 +475,13 @@ def makeJavascriptData():
# build fonts
print "Making lookup type 1 font..."
print("Making lookup type 1 font...")
makeLookup1()
print "Making lookup type 3 font..."
print("Making lookup type 3 font...")
makeLookup3()
# output javascript data
print "Making javascript data file..."
print("Making javascript data file...")
makeJavascriptData()

35
tests/wpt/web-platform-tests/css/tools/apiclient/test.py
View file

@ -11,6 +11,7 @@
# [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
#
from __future__ import print_function
import sys
import os
import glob
@ -24,11 +25,11 @@ from apiclient import apiclient
def runTests(testFileSearch):
for testFilePath in glob.glob(testFileSearch):
print 'Running tests from: ' + testFilePath
print('Running tests from: ' + testFilePath)
with open(testFilePath) as testFile:
testData = json.load(testFile, object_pairs_hook = collections.OrderedDict)
for testSetName in testData:
print testSetName + ':'
print(testSetName + ':')
testSet = testData[testSetName]
vars = testSet['variables']
for test in testSet['testcases']:
@ -37,31 +38,31 @@ def runTests(testFileSearch):
template = uritemplate.URITemplate(test[0])
except Exception as e:
if (expectedResult):
print '* FAIL: "' + test[0] + '" got: None, expected "' + expectedResult + '"'
print('* FAIL: "' + test[0] + '" got: None, expected "' + expectedResult + '"')
else:
print ' PASS: "' + test[0] + '" == None'
print(' PASS: "' + test[0] + '" == None')
continue
result = template.expand(**vars)
if (isinstance(expectedResult, basestring)):
if (expectedResult != result):
print '* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected "' + expectedResult + '"'
print('* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected "' + expectedResult + '"')
continue
elif (isinstance(expectedResult, list)):
for possibleResult in expectedResult:
if (possibleResult == result):
break
else:
print '* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected:'
print " or\n".join([' "' + possibleResult + '"' for possibleResult in expectedResult])
print('* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected:')
print(" or\n".join([' "' + possibleResult + '"' for possibleResult in expectedResult]))
continue
elif (not expectedResult):
if (result):
print '* FAIL "' + test[0] + '" got: "' + unicode(result) + '", expected None'
print('* FAIL "' + test[0] + '" got: "' + unicode(result) + '", expected None')
continue
else:
print '** Unknown expected result type: ' + repr(expectedResult)
print ' PASS: "' + test[0] + '" == "' + result + '"'
print('** Unknown expected result type: ' + repr(expectedResult))
print(' PASS: "' + test[0] + '" == "' + result + '"')
def debugHook(type, value, tb):
if hasattr(sys, 'ps1') or not sys.stderr.isatty():
@ -72,7 +73,7 @@ def debugHook(type, value, tb):
import traceback, pdb
# we are NOT in interactive mode, print the exception...
traceback.print_exception(type, value, tb)
print
print()
# ...then start the debugger in post-mortem mode.
pdb.pm()
@ -88,18 +89,18 @@ if __name__ == "__main__": # called from the command line
github = apiclient.APIClient('https://api.github.com/', version = 'vnd.github.beta')
print github.get('user_url', user = 'plinss').data
print(github.get('user_url', user = 'plinss').data)
# shepherd = apiclient.APIClient('https://api.csswg.org/shepherd/', version = 'vnd.csswg.shepherd.v1')
shepherd = apiclient.APIClient('https://test.linss.com/shepherd/api', version = 'vnd.csswg.shepherd.v1')
print shepherd.resourceNames
print(shepherd.resourceNames)
specs = shepherd.resource('specifications')
print specs.variables
print(specs.variables)
# print specs.hints.docs
print shepherd.get('specifications', spec = 'compositing-1', anchors = False).data
print(shepherd.get('specifications', spec = 'compositing-1', anchors = False).data)
suites = shepherd.resource('test_suites')
print suites.variables
print shepherd.get('test_suites', spec = 'css-shapes-1').data
print(suites.variables)
print(shepherd.get('test_suites', spec = 'css-shapes-1').data)

5
tests/wpt/web-platform-tests/css/tools/w3ctestlib/Sources.py
View file

@ -3,6 +3,7 @@
# Initial code by fantasai, joint copyright 2010 W3C and Microsoft
# Licensed under BSD 3-Clause: <http://www.w3.org/Consortium/Legal/2008/03-bsd-license>
from __future__ import print_function
from os.path import basename, exists, join
import os
import filecmp
@ -965,7 +966,7 @@ class XMLSource(FileSource):
if ((not self.metadata) and self.tree and (not self.errors)):
self.extractMetadata(self.tree)
except etree.ParseError as e:
print "PARSE ERROR: " + self.sourcepath
print("PARSE ERROR: " + self.sourcepath)
self.cacheAsParseError(self.sourcepath, e)
e.W3CTestLibErrorLocation = self.sourcepath
self.errors = [str(e)]
@ -1375,7 +1376,7 @@ class HTMLSource(XMLSource):
if ((not self.metadata) and self.tree and (not self.errors)):
self.extractMetadata(self.tree)
except Exception as e:
print "PARSE ERROR: " + self.sourcepath
print("PARSE ERROR: " + self.sourcepath)
e.W3CTestLibErrorLocation = self.sourcepath
self.errors = [str(e)]
self.encoding = 'utf-8'

2
tests/wpt/web-platform-tests/interfaces/mediasession.idl
View file

@ -21,7 +21,7 @@ enum MediaSessionAction {
"seekforward",
"previoustrack",
"nexttrack",
"skip-ad",
"skipad",
};
callback MediaSessionActionHandler = void();

2
tests/wpt/web-platform-tests/interfaces/webrtc.idl
View file

@ -628,7 +628,7 @@ enum RTCErrorDetailType {
};
[Exposed=Window,
Constructor(DOMString type, RTCErrorEventInit eventInitDict)]
Constructor(DOMString type, optional RTCErrorEventInit eventInitDict)]
interface RTCErrorEvent : Event {
readonly attribute RTCError? error;
};

3
tests/wpt/web-platform-tests/lint.whitelist
View file

@ -294,7 +294,8 @@ GENERATE_TESTS: shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/w
SET TIMEOUT: css/css-fonts/font-display/font-display.html
SET TIMEOUT: css/css-fonts/font-display/font-display-change.html
SET TIMEOUT: css/css-fonts/font-display/font-display-change-ref.html
SET TIMEOUT: css/css-fonts/font-display/font-display-feature-policy.tentative.html
SET TIMEOUT: css/css-fonts/font-display/font-display-feature-policy-01.tentative.html
SET TIMEOUT: css/css-fonts/font-display/font-display-feature-policy-02.tentative.html
SET TIMEOUT: css/css-fonts/font-display/font-display-preload.html
SET TIMEOUT: html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html
SET TIMEOUT: html/dom/documents/dom-tree-accessors/Document.currentScript.html

24
tests/wpt/web-platform-tests/streams/writable-streams/write.any.js
View file

@ -251,3 +251,27 @@ promise_test(() => {
});
return ws.getWriter().write('a').then(() => assert_true(thenCalled, 'thenCalled should be true'));
}, 'returning a thenable from write() should work');
promise_test(() => {
const stream = new WritableStream();
const writer = stream.getWriter();
const WritableStreamDefaultWriter = writer.constructor;
assert_throws(new TypeError(), () => new WritableStreamDefaultWriter(stream),
'should not be able to construct on locked stream');
// If stream.[[writer]] no longer points to |writer| then the closed Promise
// won't work properly.
return Promise.all([writer.close(), writer.closed]);
}, 'failing DefaultWriter constructor should not release an existing writer');
promise_test(t => {
const ws = new WritableStream({
start() {
return Promise.reject(error1);
}
}, { highWaterMark: 0 });
const writer = ws.getWriter();
return Promise.all([
promise_rejects(t, error1, writer.ready, 'ready should be rejected'),
promise_rejects(t, error1, writer.write(), 'write() should be rejected')
]);
}, 'write() on a stream with HWM 0 should not cause the ready Promise to resolve');

15
tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
View file

@ -51,6 +51,7 @@ or
# run echo client to test IETF HyBi 00 protocol
run with --protocol-version=hybi00
"""
from __future__ import print_function
import base64
@ -940,15 +941,15 @@ class EchoClient(object):
for line in self._options.message.split(','):
self._stream.send_message(line)
if self._options.verbose:
print 'Send: %s' % line
print('Send: %s' % line)
try:
received = self._stream.receive_message()
if self._options.verbose:
print 'Recv: %s' % received
print('Recv: %s' % received)
except Exception, e:
if self._options.verbose:
print 'Error: %s' % e
print('Error: %s' % e)
raise
self._do_closing_handshake()
@ -964,15 +965,15 @@ class EchoClient(object):
self._logger.info('Wait for server-initiated closing handshake')
message = self._stream.receive_message()
if message is None:
print 'Recv close'
print 'Send ack'
print('Recv close')
print('Send ack')
self._logger.info(
'Received closing handshake and sent ack')
return
print 'Send close'
print('Send close')
self._stream.close_connection()
self._logger.info('Sent closing handshake')
print 'Recv ack'
print('Recv ack')
self._logger.info('Received ack')

9
tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
View file

@ -31,6 +31,7 @@
"""Tests for msgutil module."""
from __future__ import print_function
import array
@ -884,7 +885,7 @@ class PerMessageDeflateTest(unittest.TestCase):
compressed_empty = compressed_empty[:-4]
expected += '\x80%c' % len(compressed_empty)
expected += compressed_empty
print '%r' % expected
print('%r' % expected)
self.assertEqual(expected, request.connection.written_data())
def test_send_message_fragmented_empty_last_frame(self):
@ -1064,7 +1065,7 @@ class PerMessageDeflateTest(unittest.TestCase):
frame_count += 1
print "Chunk sizes: %r" % chunk_sizes
print("Chunk sizes: %r" % chunk_sizes)
self.assertTrue(len(chunk_sizes) > 10)
# Close frame
@ -1167,9 +1168,9 @@ class PerMessageDeflateTest(unittest.TestCase):
compress = None
finish_used = True
print "Chunk sizes: %r" % chunk_sizes
print("Chunk sizes: %r" % chunk_sizes)
self.assertTrue(len(chunk_sizes) > 10)
print "Methods: %r" % methods
print("Methods: %r" % methods)
self.assertTrue(sync_used)
self.assertTrue(finish_used)

3
tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py
View file

@ -31,6 +31,7 @@
"""Tests for util module."""
from __future__ import print_function
import os
@ -172,7 +173,7 @@ class InflaterDeflaterTest(unittest.TestCase):
[chr(random.randint(0, 255)) for i in xrange(100 * 1024)])
chunked_input = get_random_section(source, 10)
print "Input chunk sizes: %r" % [len(c) for c in chunked_input]
print("Input chunk sizes: %r" % [len(c) for c in chunked_input])
deflater = util._Deflater(15)
compressed = []

2
tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
View file

@ -1,5 +1,5 @@
html5lib == 1.0.1
mozinfo == 0.10
mozlog==3.10
mozlog==4.0
mozdebug==0.1.1
urllib3[secure]==1.24.1

10
tests/wpt/web-platform-tests/tools/wptrunner/setup.py
View file

@ -2,6 +2,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import print_function
import glob
import os
import sys
@ -60,12 +62,12 @@ setup(name=PACKAGE_NAME,
if "install" in sys.argv:
path = os.path.relpath(os.path.join(sys.prefix, "requirements"), os.curdir)
print textwrap.fill("""In order to use with one of the built-in browser
print(textwrap.fill("""In order to use with one of the built-in browser
products, you will need to install the extra dependencies. These are provided
as requirements_[name].txt in the %s directory and can be installed using
e.g.""" % path, 80)
e.g.""" % path, 80))
print """
print("""
pip install -r %s/requirements_firefox.txt
""" % path
""" % path)

3
tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
import ConfigParser
import argparse
import os
@ -153,7 +154,7 @@ def main():
if args.pdb:
import pdb
import traceback
print traceback.format_exc()
print(traceback.format_exc())
pdb.post_mortem()
else:
raise

3
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
from .base import Browser, ExecutorBrowser, require_arg
from ..webdriver_server import EdgeDriverServer
from ..executors import executor_kwargs as base_executor_kwargs
@ -76,7 +77,7 @@ class EdgeBrowser(Browser):
def start(self, **kwargs):
print self.server.url
print(self.server.url)
self.server.start()
def stop(self, force=False):

2
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
View file

@ -372,7 +372,7 @@ class SeleniumRefTestExecutor(RefTestExecutor):
"""return [window.outerWidth - window.innerWidth,
window.outerHeight - window.innerHeight];"""
)
self.protocol.webdriver.set_window_size(600 + width_offset, 600 + height_offset)
self.protocol.webdriver.set_window_rect(0, 0, 600 + width_offset, 600 + height_offset)
result = self.implementation.run_test(test)

5
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
import base64
import json
import os
@ -136,7 +137,7 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
self.result_flag.set()
else:
if self.interactive:
print line
print(line)
else:
self.logger.process_output(self.proc.pid,
line,
@ -267,7 +268,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
def on_output(self, line):
line = line.decode("utf8", "replace")
if self.interactive:
print line
print(line)
else:
self.logger.process_output(self.proc.pid,
line,

1
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
View file

@ -405,6 +405,7 @@ class WebDriverRefTestExecutor(RefTestExecutor):
"""return [window.outerWidth - window.innerWidth,
window.outerHeight - window.innerHeight];"""
)
self.protocol.webdriver.window.position = (0, 0)
self.protocol.webdriver.window.size = (600 + width_offset, 600 + height_offset)
result = self.implementation.run_test(test)

2
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js
View file

@ -1 +1 @@
var win = window.open("about:blank", "test", "width=600,height=600");
var win = window.open("about:blank", "test", "left=0,top=0,width=600,height=600");

3
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
import itertools
import os
import urlparse
@ -89,7 +90,7 @@ class ExpectedManifest(ManifestItem):
def append(self, child):
ManifestItem.append(self, child)
if child.id in self.child_map:
print "Warning: Duplicate heading %s" % child.id
print("Warning: Duplicate heading %s" % child.id)
self.child_map[child.id] = child
def _remove_child(self, child):

7
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
import array
import os
import shutil
@ -49,9 +50,9 @@ def update_expected(test_paths, serve_root, log_file_names,
for test in updated_ini.iterchildren():
for subtest in test.iterchildren():
if subtest.new_disabled:
print "disabled: %s" % os.path.dirname(subtest.root.test_path) + "/" + subtest.name
print("disabled: %s" % os.path.dirname(subtest.root.test_path) + "/" + subtest.name)
if test.new_disabled:
print "disabled: %s" % test.root.test_path
print("disabled: %s" % test.root.test_path)
def do_delayed_imports(serve_root):
@ -359,7 +360,7 @@ class ExpectedUpdater(object):
try:
test_data = self.id_test_map[test_id]
except KeyError:
print "Test not found %s, skipping" % test_id
print("Test not found %s, skipping" % test_id)
return
if self.ignore_existing:

19
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
View file

@ -1,3 +1,4 @@
from __future__ import print_function
import argparse
import os
import sys
@ -29,7 +30,7 @@ def require_arg(kwargs, name, value_func=None):
value_func = lambda x: x is not None
if name not in kwargs or not value_func(kwargs[name]):
print >> sys.stderr, "Missing required argument %s" % name
print("Missing required argument %s" % name, file=sys.stderr)
sys.exit(1)
@ -417,7 +418,7 @@ def check_paths(kwargs):
for test_paths in kwargs["test_paths"].itervalues():
if not ("tests_path" in test_paths and
"metadata_path" in test_paths):
print "Fatal: must specify both a test path and metadata path"
print("Fatal: must specify both a test path and metadata path")
sys.exit(1)
if "manifest_path" not in test_paths:
test_paths["manifest_path"] = os.path.join(test_paths["metadata_path"],
@ -431,11 +432,11 @@ def check_paths(kwargs):
path = os.path.dirname(path)
if not os.path.exists(path):
print "Fatal: %s path %s does not exist" % (name, path)
print("Fatal: %s path %s does not exist" % (name, path))
sys.exit(1)
if not os.path.isdir(path):
print "Fatal: %s path %s is not a directory" % (name, path)
print("Fatal: %s path %s is not a directory" % (name, path))
sys.exit(1)
@ -488,7 +489,7 @@ def check_args(kwargs):
if kwargs["binary"] is not None:
if not os.path.exists(kwargs["binary"]):
print >> sys.stderr, "Binary path %s does not exist" % kwargs["binary"]
print("Binary path %s does not exist" % kwargs["binary"], file=sys.stderr)
sys.exit(1)
if kwargs["ssl_type"] is None:
@ -507,14 +508,14 @@ def check_args(kwargs):
elif kwargs["ssl_type"] == "openssl":
path = exe_path(kwargs["openssl_binary"])
if path is None:
print >> sys.stderr, "openssl-binary argument missing or not a valid executable"
print("openssl-binary argument missing or not a valid executable", file=sys.stderr)
sys.exit(1)
kwargs["openssl_binary"] = path
if kwargs["ssl_type"] != "none" and kwargs["product"] == "firefox" and kwargs["certutil_binary"]:
path = exe_path(kwargs["certutil_binary"])
if path is None:
print >> sys.stderr, "certutil-binary argument missing or not a valid executable"
print("certutil-binary argument missing or not a valid executable", file=sys.stderr)
sys.exit(1)
kwargs["certutil_binary"] = path
@ -524,7 +525,7 @@ def check_args(kwargs):
kwargs['extra_prefs'] = [kwargs['extra_prefs']]
missing = any('=' not in prefarg for prefarg in kwargs['extra_prefs'])
if missing:
print >> sys.stderr, "Preferences via --setpref must be in key=value format"
print("Preferences via --setpref must be in key=value format", file=sys.stderr)
sys.exit(1)
kwargs['extra_prefs'] = [tuple(prefarg.split('=', 1)) for prefarg in
kwargs['extra_prefs']]
@ -551,7 +552,7 @@ def check_args_update(kwargs):
for item in kwargs["run_log"]:
if os.path.isdir(item):
print >> sys.stderr, "Log file %s is a directory" % item
print("Log file %s is a directory" % item, file=sys.stderr)
sys.exit(1)
return kwargs

10
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
View file

@ -1,4 +1,4 @@
from __future__ import unicode_literals
from __future__ import print_function, unicode_literals
import json
import os
@ -91,7 +91,7 @@ def list_test_groups(test_paths, product, **kwargs):
run_info_extras=run_info_extras, **kwargs)
for item in sorted(test_loader.groups(kwargs["test_types"])):
print item
print(item)
def list_disabled(test_paths, product, **kwargs):
@ -107,7 +107,7 @@ def list_disabled(test_paths, product, **kwargs):
for test_type, tests in test_loader.disabled_tests.iteritems():
for test in tests:
rv.append({"test": test.id, "reason": test.disabled()})
print json.dumps(rv, indent=2)
print(json.dumps(rv, indent=2))
def list_tests(test_paths, product, **kwargs):
@ -119,7 +119,7 @@ def list_tests(test_paths, product, **kwargs):
run_info_extras=run_info_extras, **kwargs)
for test in test_loader.test_ids:
print test
print(test)
def get_pause_after_test(test_loader, **kwargs):
@ -361,7 +361,7 @@ def main():
if kwargs["pdb"]:
import pdb
import traceback
print traceback.format_exc()
print(traceback.format_exc())
pdb.post_mortem()
else:
raise

88
tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html Normal file
View file

@ -0,0 +1,88 @@
<!DOCTYPE html>
<body>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="resources/webxr_util.js"></script>
<canvas></canvas>
<script>
let immersiveTestName =
"Identity reference space provides correct poses for immersive sessions";
let inlineTestName =
"Identity reference space provides correct poses for inline sessions";
let fakeDeviceInitParams = { supportsImmersive: true };
let immersiveSessionOptions = { mode: 'immersive-vr' };
let inlineSessionOptions = { outputContext: getOutputContext() };
const identityMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
// Valid matrices for when we don't care about specific values
const validPoseMatrix = [0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1];
const validProjectionMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 3, 2, -1, -1, 0, 0, -0.2, 0];
const validViewMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4, 3, 2, 1];
let testFunction = function(session, fakeDeviceController, t) {
return session.requestReferenceSpace({ type: 'identity' })
.then((referenceSpace) => new Promise((resolve, reject) => {
let counter = 0;
function onFrame(time, xrFrame) {
session.requestAnimationFrame(onFrame);
if (counter == 0) {
t.step( () => {
// Expect to always get a pose, even if none has been supplied.
let pose = xrFrame.getViewerPose(referenceSpace);
assert_not_equals(pose, null);
let poseMatrix = pose.poseModelMatrix;
assert_not_equals(poseMatrix, null);
for(let i = 0; i < poseMatrix.length; i++) {
assert_equals(poseMatrix[i], identityMatrix[i]);
}
fakeDeviceController.setXRPresentationFrameData(
validPoseMatrix, [{
eye:"left",
projectionMatrix: validProjectionMatrix,
viewMatrix: validViewMatrix
}, {
eye:"right",
projectionMatrix: validProjectionMatrix,
viewMatrix: validViewMatrix
}]);
});
} else {
t.step( () => {
// Assert that the identity matrix is always given as the pose
// even when a valid pose is set by the device.
let pose = xrFrame.getViewerPose(referenceSpace);
assert_not_equals(pose, null);
let poseMatrix = pose.poseModelMatrix;
assert_not_equals(poseMatrix, null);
for(let i = 0; i < poseMatrix.length; i++) {
assert_equals(poseMatrix[i], identityMatrix[i]);
}
});
// Finished.
resolve();
}
counter++;
}
session.requestAnimationFrame(onFrame);
}));
};
xr_session_promise_test(inlineTestName, testFunction,
fakeDeviceInitParams, inlineSessionOptions);
xr_session_promise_test(immersiveTestName, testFunction,
fakeDeviceInitParams, immersiveSessionOptions);
</script>
</body>

8
tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
View file

@ -21,6 +21,14 @@
.then(() => promise_rejects(t, "NotSupportedError", session.requestReferenceSpace({ type: "stationary" })))
.then(() => promise_rejects(t, new TypeError(), session.requestReferenceSpace({ type: "stationary", subtype: "bar" })))
.then(() => Promise.all([
session.requestReferenceSpace({ type: "identity" }).then( (referenceSpace) => {
t.step(() => {
assert_true(referenceSpace instanceof XRSpace,
"identity reference space is not correct type.");
assert_true(referenceSpace instanceof XRReferenceSpace,
"identity reference space is not correct type.");
});
}),
session.requestReferenceSpace({ type: "stationary", subtype: "position-disabled" }).then( (referenceSpace) => {
t.step(() => {
assert_true(referenceSpace instanceof XRSpace,