From e2ba0811a8cadc14ace76392129f801a3e624c98 Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 16 Jan 2018 22:04:25 +0000 Subject: [PATCH 01/16] Run one chunk of tests in firefox on push --- .taskcluster.yml | 27 +++++++++++++++++++++++++++ tools/ci/ci_taskcluster.ci | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 .taskcluster.yml create mode 100644 tools/ci/ci_taskcluster.ci diff --git a/.taskcluster.yml b/.taskcluster.yml new file mode 100644 index 00000000000000..ad38a865fe4dd7 --- /dev/null +++ b/.taskcluster.yml @@ -0,0 +1,27 @@ +version: 0 +tasks: + - provisionerId: '{{ taskcluster.docker.provisionerId }}' + workerType: '{{ taskcluster.docker.workerType }}' + extra: + github: + events: + - push + branches: + - master + payload: + maxRunTime: 3600 + image: python + command: + - /bin/bash + - '--login' + - '-c' + - >- + git clone {{event.head.repo.url}} repo && cd repo && git config + advice.detachedHead false && git checkout {{event.head.sha}} && + tools/ci/ci_taskcluster.sh firefox testharness 1 12 + metadata: + name: 'firefox-nightly-testharness-1' + description: '' + owner: '{{ event.head.user.email }}' + source: '{{ event.head.repo.url }}' +allowPullRequests: collaborators diff --git a/tools/ci/ci_taskcluster.ci b/tools/ci/ci_taskcluster.ci new file mode 100644 index 00000000000000..871534b372f556 --- /dev/null +++ b/tools/ci/ci_taskcluster.ci @@ -0,0 +1,4 @@ +#!/bin/bash + +pip install virtualenv +./wpt run $1 --log-tbpl=- --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 From 74134e15df53c373fdfacb36b377d4062297e0dd Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 16 Jan 2018 22:16:32 +0000 Subject: [PATCH 02/16] Fixup taskcluster --- .taskcluster.yml | 2 +- tools/ci/{ci_taskcluster.ci => ci_taskcluster.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tools/ci/{ci_taskcluster.ci => ci_taskcluster.sh} (100%) mode change 100644 => 100755 diff --git a/.taskcluster.yml b/.taskcluster.yml index ad38a865fe4dd7..d4a60c099740c6 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -18,7 +18,7 @@ tasks: - >- git clone {{event.head.repo.url}} repo && cd repo && git config advice.detachedHead false && git checkout {{event.head.sha}} && - tools/ci/ci_taskcluster.sh firefox testharness 1 12 + ./tools/ci/ci_taskcluster.sh firefox testharness 1 12 metadata: name: 'firefox-nightly-testharness-1' description: '' diff --git a/tools/ci/ci_taskcluster.ci b/tools/ci/ci_taskcluster.sh old mode 100644 new mode 100755 similarity index 100% rename from tools/ci/ci_taskcluster.ci rename to tools/ci/ci_taskcluster.sh From 46cb5e8c446eb3fd5623ec7263bca8b4a8aa4e2a Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 16 Jan 2018 22:23:26 +0000 Subject: [PATCH 03/16] Force python2 --- tools/ci/ci_taskcluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index 871534b372f556..4093a094f2fa9e 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,4 +1,4 @@ #!/bin/bash pip install virtualenv -./wpt run $1 --log-tbpl=- --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 +python2 wpt run $1 --log-tbpl=- --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 From 8e3d51be16725f49cd1a80f804bddbe4dd9b3c19 Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 16 Jan 2018 22:33:03 +0000 Subject: [PATCH 04/16] fixup! Force python2 --- tools/ci/ci_taskcluster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index 4093a094f2fa9e..307971a83c06f5 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,4 +1,4 @@ #!/bin/bash -pip install virtualenv -python2 wpt run $1 --log-tbpl=- --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 +pip2 install virtualenv +python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 From 439e78bea09b17be75de7f5b4a4d745a005f0245 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 10:50:14 +0000 Subject: [PATCH 05/16] Increase logging --- tools/ci/ci_taskcluster.sh | 2 +- tools/wpt/utils.py | 2 +- tools/wpt/wpt.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index 307971a83c06f5..650b17d8f2dc8a 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,4 +1,4 @@ #!/bin/bash -pip2 install virtualenv +pip install virtualenv python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 diff --git a/tools/wpt/utils.py b/tools/wpt/utils.py index e1f4cd4bb5c75d..40e1a45d28d0e5 100644 --- a/tools/wpt/utils.py +++ b/tools/wpt/utils.py @@ -39,7 +39,7 @@ def call(*args): Returns a bytestring of the subprocess output if no error. """ - logger.debug("%s" % " ".join(args)) + logger.info("%s" % " ".join(args)) try: return subprocess.check_output(args) except subprocess.CalledProcessError as e: diff --git a/tools/wpt/wpt.py b/tools/wpt/wpt.py index 49f463d2a9ed1e..e183bef230da97 100644 --- a/tools/wpt/wpt.py +++ b/tools/wpt/wpt.py @@ -90,7 +90,7 @@ def setup_virtualenv(path, props): def main(prog=None, argv=None): - logging.basicConfig(level=logging.INFO) + logging.basicConfig(level=logging.DEBUG) if prog is None: prog = sys.argv[0] From a154d54ff5a938de3176883691ad8ad0ecfcd2f4 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 10:56:05 +0000 Subject: [PATCH 06/16] Increase logging --- tools/wpt/virtualenv.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/wpt/virtualenv.py b/tools/wpt/virtualenv.py index 8f36aa93585ffd..d6b606a2a36ac1 100644 --- a/tools/wpt/virtualenv.py +++ b/tools/wpt/virtualenv.py @@ -7,6 +7,7 @@ logger = logging.getLogger(__name__) + class Virtualenv(object): def __init__(self, path): self.path = path @@ -38,7 +39,9 @@ def pip_path(self): def activate(self): path = os.path.join(self.bin_path, "activate_this.py") + logger.info("Activating virtualenv %s" % path) execfile(path, {"__file__": path}) + logger.info(sys.path) def start(self): if not self.exists: From 2a9df579b291fc63f6a29115e3d855899a660279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 16 Jan 2018 23:19:35 +0000 Subject: [PATCH 07/16] Don't allow fallback alignment in place-content shorthand. bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1430622 gecko-commit: 2ea467872d7fcd3dbb31fcf881e4147b6dd6bebe gecko-integration-branch: autoland gecko-reviewers: xidorn, mats --- .../place-content-shorthand-007-ref.html | 22 +++++++++++++++++++ .../place-content-shorthand-007.html | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 css/css-align/content-distribution/place-content-shorthand-007-ref.html create mode 100644 css/css-align/content-distribution/place-content-shorthand-007.html diff --git a/css/css-align/content-distribution/place-content-shorthand-007-ref.html b/css/css-align/content-distribution/place-content-shorthand-007-ref.html new file mode 100644 index 00000000000000..67727f4fd26fb9 --- /dev/null +++ b/css/css-align/content-distribution/place-content-shorthand-007-ref.html @@ -0,0 +1,22 @@ + + +CSS Test Reference + + +Should see a green square centered and at the bottom of the blue square. +
diff --git a/css/css-align/content-distribution/place-content-shorthand-007.html b/css/css-align/content-distribution/place-content-shorthand-007.html new file mode 100644 index 00000000000000..be954c9712189d --- /dev/null +++ b/css/css-align/content-distribution/place-content-shorthand-007.html @@ -0,0 +1,22 @@ + + +CSS Box Alignment: place-content shorthand with fallback + + + + + +Should see a green square centered and at the bottom of the blue square. +
From 2041b3b1e1fdbe3182104aa0a68c440a4abe55bb Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Wed, 17 Jan 2018 06:14:41 +0000 Subject: [PATCH 08/16] Accept null for body param in constructor of Response. bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1303025 gecko-commit: 62f5c4a3682381134b607d359824b7605ec15156 gecko-integration-branch: autoland gecko-reviewers: bkelly --- fetch/api/response/response-init-002.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fetch/api/response/response-init-002.html b/fetch/api/response/response-init-002.html index 0bb2e8d0b3b28d..a48af833644efe 100644 --- a/fetch/api/response/response-init-002.html +++ b/fetch/api/response/response-init-002.html @@ -65,6 +65,11 @@ }); }, "Testing empty Response Content-Type header"); + test(function() { + var response = new Response(null, {status: 204}); + assert_equals(response.body, null); + }, "Testing null Response body"); + From 104e3e0399a7bd31e521b0b2b3340bb1b7c52b95 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:03:01 +0000 Subject: [PATCH 09/16] Don't prompt for install --- tools/ci/ci_taskcluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index 650b17d8f2dc8a..d91e4eae682e30 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,4 +1,4 @@ #!/bin/bash pip install virtualenv -python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 +python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y From 3582712af4c4df7a169c73c3806962d0115ab6eb Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:03:14 +0000 Subject: [PATCH 10/16] Increase logging --- tools/wpt/virtualenv.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/wpt/virtualenv.py b/tools/wpt/virtualenv.py index d6b606a2a36ac1..a0573c0335d9b7 100644 --- a/tools/wpt/virtualenv.py +++ b/tools/wpt/virtualenv.py @@ -40,8 +40,13 @@ def pip_path(self): def activate(self): path = os.path.join(self.bin_path, "activate_this.py") logger.info("Activating virtualenv %s" % path) + old_sys_path = sys.path[:] + logger.info(sys.path) execfile(path, {"__file__": path}) logger.info(sys.path) + for item in sys.path: + if item not in old_sys_path: + logger.info(item) def start(self): if not self.exists: From 11f40d31dc7e50ee115b1740c99b32f5510d3b82 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:15:09 +0000 Subject: [PATCH 11/16] More logging --- tools/wpt/virtualenv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wpt/virtualenv.py b/tools/wpt/virtualenv.py index a0573c0335d9b7..7d361d8d70f911 100644 --- a/tools/wpt/virtualenv.py +++ b/tools/wpt/virtualenv.py @@ -54,7 +54,7 @@ def start(self): self.activate() def install(self, *requirements): - call(self.pip_path, "install", *requirements) + logger.info(call(self.pip_path, "install", *requirements)) def install_requirements(self, requirements_path): - call(self.pip_path, "install", "-r", requirements_path) + logger.info(call(self.pip_path, "install", "-r", requirements_path)) From 3bd70ad19d1ec22e0b620c89d7d783532310fb1d Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:19:34 +0000 Subject: [PATCH 12/16] Use sys.executable for virtualenv --- tools/wpt/virtualenv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wpt/virtualenv.py b/tools/wpt/virtualenv.py index 7d361d8d70f911..6abaec5f875811 100644 --- a/tools/wpt/virtualenv.py +++ b/tools/wpt/virtualenv.py @@ -22,7 +22,7 @@ def exists(self): def create(self): if os.path.exists(self.path): shutil.rmtree(self.path) - call(self.virtualenv, self.path) + call(self.virtualenv, self.path, "-p", sys.executable) @property def bin_path(self): From 280b22b90765f9b2bca0805624de1c2e4c677ef4 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:23:10 +0000 Subject: [PATCH 13/16] Install browser in TC --- tools/ci/ci_taskcluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index d91e4eae682e30..e81ae97ea6c8fc 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,4 +1,4 @@ #!/bin/bash pip install virtualenv -python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y +python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y --install-browser From 853387ea91a39fc712487f0692e609291ce06db1 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:44:56 +0000 Subject: [PATCH 14/16] Install dependencies --- tools/ci/ci_taskcluster.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index e81ae97ea6c8fc..05248a33de40e7 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,4 +1,7 @@ #!/bin/bash -pip install virtualenv +# To make sure we have all the deps installed +sudo apt install firefox + +pip -q install virtualenv python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y --install-browser From 4953343aa47f23ad27914b36b39070cff1042518 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 17 Jan 2018 11:52:53 +0000 Subject: [PATCH 15/16] fixup! Install dependencies --- tools/ci/ci_taskcluster.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh index 05248a33de40e7..019b75d3fa37dd 100755 --- a/tools/ci/ci_taskcluster.sh +++ b/tools/ci/ci_taskcluster.sh @@ -1,7 +1,9 @@ #!/bin/bash +set -xe + # To make sure we have all the deps installed -sudo apt install firefox +apt install firefox pip -q install virtualenv python2 wpt run $1 --log-tbpl=- --log-tbpl-level=debug --log-wptreport=wpt_report.json --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y --install-browser From df0bd8143b504efe3f4d061a34e5cd4ac017d94a Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 17 Jan 2018 22:09:34 +0000 Subject: [PATCH 16/16] Safely shutdown Firefox from in delete_session. With the request to shutdown the browser, a given amount of time has to be waited to allow the process to shutdown itself. Only if the process is still running afterward it has to be killed. Firefox has an integrated background monitor which observes long running threads during shutdown, and kills those after 65s. To allow Firefox to shutdown on its own, geckodriver has to wait that time, and some additional seconds. bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1403923 gecko-commit: 025d4690bfbe602a82d91f827a67208df80dc110 gecko-integration-branch: central gecko-reviewers: jgraham --- webdriver/tests/state/get_element_attribute.py | 2 ++ webdriver/tests/state/get_element_property.py | 2 ++ webdriver/tests/state/get_element_tag_name.py | 2 ++ webdriver/tests/state/is_element_selected.py | 2 ++ 4 files changed, 8 insertions(+) diff --git a/webdriver/tests/state/get_element_attribute.py b/webdriver/tests/state/get_element_attribute.py index 1301a45a73c5dd..ce78e11d3ff22b 100644 --- a/webdriver/tests/state/get_element_attribute.py +++ b/webdriver/tests/state/get_element_attribute.py @@ -1,3 +1,5 @@ +# META: timeout=long + import pytest from tests.support.asserts import assert_error, assert_success, assert_dialog_handled diff --git a/webdriver/tests/state/get_element_property.py b/webdriver/tests/state/get_element_property.py index c76c56104628c9..e4da98e0c3facc 100644 --- a/webdriver/tests/state/get_element_property.py +++ b/webdriver/tests/state/get_element_property.py @@ -1,3 +1,5 @@ +# META: timeout=long + from tests.support.asserts import assert_error, assert_dialog_handled, assert_success from tests.support.inline import inline from tests.support.fixtures import create_dialog diff --git a/webdriver/tests/state/get_element_tag_name.py b/webdriver/tests/state/get_element_tag_name.py index 2dd7528bb2092e..e3ed83f3f20ec7 100644 --- a/webdriver/tests/state/get_element_tag_name.py +++ b/webdriver/tests/state/get_element_tag_name.py @@ -1,3 +1,5 @@ +# META: timeout=long + from tests.support.asserts import assert_error, assert_dialog_handled, assert_success from tests.support.inline import inline from tests.support.fixtures import create_dialog diff --git a/webdriver/tests/state/is_element_selected.py b/webdriver/tests/state/is_element_selected.py index 392929a582864a..b51ba020fa4cc3 100644 --- a/webdriver/tests/state/is_element_selected.py +++ b/webdriver/tests/state/is_element_selected.py @@ -1,3 +1,5 @@ +# META: timeout=long + from tests.support.asserts import assert_error, assert_dialog_handled, assert_success from tests.support.inline import inline from tests.support.fixtures import create_dialog