Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 07:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8415 - mrobinson:create-wpt-relative, r=frewsxcv

Browse source 
Form relative reference URLs during create-wpt

Instead of always using the absolute path to the reference file when
creating new reference tests, create-wpt now creates relative URLs if
the files are in the same directory. This is the most common case for
new Servo tests. Also fix some missing quotation marks in the
create-wpt template.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8415)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-09 22:43:25 +05:30
commit 5fda719fa8
1 changed files with 52 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

85
python/servo/testing_commands.py
View file

@ -30,7 +30,10 @@ from wptrunner import wptcommandline
from update import updatecommandline from update import updatecommandline
import tidy import tidy
here = os.path.split(__file__)[0] SCRIPT_PATH = os.path.split(__file__)[0]
PROJECT_TOPLEVEL_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, "..", ".."))
WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "web-platform-tests")
SERVO_TESTS_PATH = os.path.join("tests", "wpt", "mozilla", "tests")
def create_parser_wpt(): def create_parser_wpt():
@ -486,68 +489,84 @@ def create_parser_create():
@CommandProvider @CommandProvider
class WebPlatformTestsCreator(CommandBase): class WebPlatformTestsCreator(CommandBase):
template_prefix = """<!doctype html> template_prefix = """<!doctype html>
%(documentElement)s<meta charset=utf-8> %(documentElement)s<meta charset="utf-8">
""" """
template_long_timeout = "<meta name=timeout content=long>\n" template_long_timeout = "<meta name=timeout content=long>\n"
template_body_th = """<title></title> template_body_th = """<title></title>
<script src=/resources/testharness.js></script> <script src="/resources/testharness.js"></script>
<script src=/resources/testharnessreport.js></script> <script src="/resources/testharnessreport.js"></script>
<script> <script>
</script> </script>
""" """
template_body_reftest = """<title></title> template_body_reftest = """<title></title>
<link rel=%(match)s href=%(ref)s> <link rel="%(match)s" href="%(ref)s">
""" """
template_body_reftest_wait = """<script src="/common/reftest-wait.js"></script> template_body_reftest_wait = """<script src="/common/reftest-wait.js"></script>
""" """
def rel_path(self, path): def make_test_file_url(self, absolute_file_path):
if path is None: # Make the path relative to the project top-level directory so that
return # we can more easily find the right test directory.
file_path = os.path.relpath(absolute_file_path, PROJECT_TOPLEVEL_PATH)
abs_path = os.path.normpath(os.path.abspath(path)) if file_path.startswith(WEB_PLATFORM_TESTS_PATH):
return os.path.relpath(abs_path, os.path.abspath(os.path.join(here, "..", ".."))) url = file_path[len(WEB_PLATFORM_TESTS_PATH):]
elif file_path.startswith(SERVO_TESTS_PATH):
def rel_url(self, rel_path): url = "/mozilla" + file_path[len(SERVO_TESTS_PATH):]
upstream_path = os.path.join("tests", "wpt", "web-platform-tests") else: # This test file isn't in any known test directory.
local_path = os.path.join("tests", "wpt", "mozilla", "tests")
if rel_path.startswith(upstream_path):
return rel_path[len(upstream_path):].replace(os.path.sep, "/")
elif rel_path.startswith(local_path):
return "/_mozilla" + rel_path[len(local_path):].replace(os.path.sep, "/")
else:
return None return None
return url.replace(os.path.sep, "/")
def make_test_and_reference_urls(self, test_path, reference_path):
test_path = os.path.normpath(os.path.abspath(test_path))
test_url = self.make_test_file_url(test_path)
if test_url is None:
return (None, None)
if reference_path is None:
return (test_url, '')
reference_path = os.path.normpath(os.path.abspath(reference_path))
# If the reference is in the same directory, the URL can just be the
# name of the refernce file itself.
reference_path_parts = os.path.split(reference_path)
if reference_path_parts[0] == os.path.split(test_path)[0]:
return (test_url, reference_path_parts[1])
return (test_url, self.make_test_file_url(reference_path))
@Command("create-wpt", @Command("create-wpt",
category="testing", category="testing",
parser=create_parser_create) parser=create_parser_create)
def run_create(self, **kwargs): def run_create(self, **kwargs):
import subprocess import subprocess
path = self.rel_path(kwargs["path"]) test_path = kwargs["path"]
ref_path = self.rel_path(kwargs["ref"]) reference_path = kwargs["ref"]
if kwargs["ref"]: if reference_path:
kwargs["reftest"] = True kwargs["reftest"] = True
if self.rel_url(path) is None: (test_url, reference_url) = self.make_test_and_reference_urls(
test_path, reference_path)
if test_url is None:
print("""Test path %s is not in wpt directories: print("""Test path %s is not in wpt directories:
tests/wpt/web-platform-tests for tests that may be shared tests/wpt/web-platform-tests for tests that may be shared
tests/wpt/mozilla/tests for Servo-only tests""" % path) tests/wpt/mozilla/tests for Servo-only tests""" % test_path)
return 1 return 1
if ref_path and self.rel_url(ref_path) is None: if reference_url is None:
print("""Reference path %s is not in wpt directories: print("""Reference path %s is not in wpt directories:
testing/web-platform/tests for tests that may be shared testing/web-platform/tests for tests that may be shared
testing/web-platform/mozilla/tests for Servo-only tests""" % ref_path) testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
return 1 return 1
if os.path.exists(path) and not kwargs["overwrite"]: if os.path.exists(test_path) and not kwargs["overwrite"]:
print("Test path already exists, pass --overwrite to replace") print("Test path already exists, pass --overwrite to replace")
return 1 return 1
@ -559,20 +578,20 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % ref_path)
print("--wait only makes sense for a reftest") print("--wait only makes sense for a reftest")
return 1 return 1
args = {"documentElement": "<html class=reftest-wait>\n" if kwargs["wait"] else ""} args = {"documentElement": "<html class=\"reftest-wait\">\n" if kwargs["wait"] else ""}
template = self.template_prefix % args template = self.template_prefix % args
if kwargs["long_timeout"]: if kwargs["long_timeout"]:
template += self.template_long_timeout template += self.template_long_timeout
if kwargs["reftest"]: if kwargs["reftest"]:
args = {"match": "match" if not kwargs["mismatch"] else "mismatch", args = {"match": "match" if not kwargs["mismatch"] else "mismatch",
"ref": self.rel_url(ref_path) if kwargs["ref"] else '""'} "ref": reference_url}
template += self.template_body_reftest % args template += self.template_body_reftest % args
if kwargs["wait"]: if kwargs["wait"]:
template += self.template_body_reftest_wait template += self.template_body_reftest_wait
else: else:
template += self.template_body_th template += self.template_body_th
with open(path, "w") as f: with open(test_path, "w") as f:
f.write(template) f.write(template)
if kwargs["no_editor"]: if kwargs["no_editor"]:
@ -587,14 +606,14 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % ref_path)
editor = None editor = None
if editor: if editor:
proc = subprocess.Popen("%s %s" % (editor, path), shell=True) proc = subprocess.Popen("%s %s" % (editor, test_path), shell=True)
if not kwargs["no_run"]: if not kwargs["no_run"]:
p = create_parser_wpt() p = create_parser_wpt()
args = ["--manifest-update"] args = ["--manifest-update"]
if kwargs["release"]: if kwargs["release"]:
args.append("--release") args.append("--release")
args.append(path) args.append(test_path)
wpt_kwargs = vars(p.parse_args(args)) wpt_kwargs = vars(p.parse_args(args))
self.context.commands.dispatch("test-wpt", self.context, **wpt_kwargs) self.context.commands.dispatch("test-wpt", self.context, **wpt_kwargs)