From baec4935f6c0337eb887c72676bba4c6f2fd9949 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Tue, 24 Dec 2019 17:56:15 +0000 Subject: [PATCH 1/4] Update python requirements to run test-wpt with python3 --- python/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/requirements.txt b/python/requirements.txt index 79c2374f24e..0f9c82e3a0f 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -5,8 +5,8 @@ blessings == 1.6 distro == 1.4 mach == 1.0.0 mozdebug == 0.1 -mozinfo == 0.8 -mozlog == 3.6 +mozinfo == 1.1.0 +mozlog == 5.0 setuptools == 39.0 toml == 0.9.2 From 19cc74f07dd1028990e984ca31f6f84814d0f317 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Tue, 24 Dec 2019 17:56:47 +0000 Subject: [PATCH 2/4] Run first test-wpt chunk with python3 in CI --- etc/taskcluster/decision_task.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 1032cd22d8c..1052702bf44 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -734,7 +734,13 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes, if this_chunk == 0: task.with_script(""" ./mach test-wpt-failure - time ./mach test-wpt --release --binary-arg=--multiprocess \ + time python2 ./mach test-wpt --release --binary-arg=--multiprocess \ + --processes $PROCESSES \ + --log-raw test-wpt-mp.log \ + --log-errorsummary wpt-mp-errorsummary.log \ + eventsource \ + | cat + time env PYTHONIOENCODING=utf-8 python3 ./mach test-wpt --release --binary-arg=--multiprocess \ --processes $PROCESSES \ --log-raw test-wpt-mp.log \ --log-errorsummary wpt-mp-errorsummary.log \ From 43768ff9743df04f1af4bfd1b53ce8d64a875e83 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Wed, 25 Dec 2019 18:24:53 +0000 Subject: [PATCH 3/4] Replace utf8 encoded apostrophe by a regular ascii single quote --- tests/wpt/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wpt/run.py b/tests/wpt/run.py index cfc68ea45c3..7e6fcaede82 100644 --- a/tests/wpt/run.py +++ b/tests/wpt/run.py @@ -34,7 +34,7 @@ def run_tests(**kwargs): set_defaults(kwargs) mozlog.commandline.log_formatters["servo"] = \ - (grouping_formatter.ServoFormatter, "Servo’s grouping output formatter") + (grouping_formatter.ServoFormatter, "Servo's grouping output formatter") mozlog.commandline.log_formatters["servojson"] = \ (grouping_formatter.ServoJsonFormatter, "Servo's JSON logger of unexpected results") From c48934a24f032c44fc85dad886a03f28292466ed Mon Sep 17 00:00:00 2001 From: wpt-pr-bot Date: Sat, 25 Jan 2020 21:07:17 +0000 Subject: [PATCH 4/4] macos: wpt: install pip & virtualenv for Python3 --- etc/taskcluster/decision_task.py | 2 +- etc/taskcluster/decisionlib.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 1052702bf44..afa83cc4c1b 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -658,7 +658,7 @@ def macos_wpt(): priority = "high" if CONFIG.git_ref == "refs/heads/auto" else None build_task = macos_release_build_with_debug_assertions(priority=priority) def macos_run_task(name): - task = macos_task(name).with_python2() \ + task = macos_task(name).with_python2().with_python3() \ .with_repo_bundle(alternate_object_dir="/var/cache/servo.git/objects") return with_homebrew(task, ["etc/taskcluster/macos/Brewfile"]) wpt_chunks( diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py index c1c9aaadf60..ecbdc54cfe8 100644 --- a/etc/taskcluster/decisionlib.py +++ b/etc/taskcluster/decisionlib.py @@ -693,6 +693,12 @@ class MacOsGenericWorkerTask(UnixTaskMixin, GenericWorkerTask): pip install --user virtualenv """) + def with_python3(self): + return self.with_early_script(""" + python3 -m ensurepip --user + python3 -m pip install --user virtualenv + """) + def with_rustup(self): return self.with_early_script(""" export PATH="$HOME/.cargo/bin:$PATH"