Closed Bug 1463801 Opened 2 years ago Closed 2 years ago

Update web-platform-tests to 232137f0fdacdeed99a7df5dd229d23020b0bccc

Categories

(Testing :: web-platform-tests, enhancement)

enhancement
Not set

Tracking

(firefox62 fixed)

RESOLVED FIXED
mozilla62
Tracking Status
firefox62 --- fixed

People

(Reporter: wptsync, Unassigned)

Details

(Whiteboard: [wptsync landing error])

No description provided.
Whiteboard: [wptsync landing] → [wptsync landing error]
Retriggered failing web-platform-test tasks on try before final metadata update.
Rebase failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git rebase a8ff2208d36988ba30ff24a2d3590045ef7d0bfc
  stderr: 'Cannot rebase: You have unstaged changes.
Please commit or stash them.'
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase b253d664531bac28d3ff15b50e5c894829f78cdb
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1463150 [wpt PR 11093] - Fix CORB tests using the wrong references, a=testonly
Applying: Bug 1463150 [wpt PR 11093] - Update wpt metadata, a=testonly
Applying: Bug 1463061 [wpt PR 11086] - Delete font-feature-settings-rendering-2.html with font, a=testonly
Applying: Bug 1463221 [wpt PR 11096] - [SessionStorageS13N] Fix key decoding/encoding and site isolation., a=testonly
Applying: Bug 1462454 [wpt PR 11050] - Create WebUSB idlharness test for workers, a=testonly
Applying: Bug 1462454 [wpt PR 11050] - Update wpt metadata, a=testonly
Applying: Bug 1463071 [wpt PR 11089] - [css-filter] add OWNERS, a=testonly
Applying: Bug 1463387 [wpt PR 11100] - Fix crash when setting aliases on computed style., a=testonly
Applying: Bug 1463784 [wpt PR 8494] - Add @font-face rules to load TrueType and OpenType test fonts., a=testonly
Applying: Bug 1462560 [wpt PR 11064] - [Picture-in-Picture] Add a layout test for detached frame., a=testonly
Applying: Bug 1463314 [wpt PR 11098] - [docs] s/preceed/precede, other typos/punctuation, a=testonly
Applying: Bug 1463286 [wpt PR 11097] - [tools] Disallow unused variables, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
M	testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
M	testing/web-platform/tests/tools/wptrunner/wptrunner/manifestexpected.py
M	testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py
M	testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_products.py
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_products.py
Auto-merging testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py
Auto-merging testing/web-platform/tests/tools/wptrunner/wptrunner/manifestexpected.py
Auto-merging testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
CONFLICT (content): Merge conflict in testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
Auto-merging testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
Patch failed at 0012 Bug 1463286 [wpt PR 11097] - [tools] Disallow unused variables, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1463801/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
'
  stderr: 'error: Failed to merge in the changes.'
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/9ffe3d98fb79
[wpt-sync] Update web-platform-tests to 232137f0fdacdeed99a7df5dd229d23020b0bccc, a=testonly
Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/mozilla-inbound/rev/7a9b4d40b996
Fixup wpt metadata, a=testonly ON A CLOSED TREE
https://hg.mozilla.org/mozilla-central/rev/9ffe3d98fb79
https://hg.mozilla.org/mozilla-central/rev/7a9b4d40b996
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla62
You need to log in before you can comment on or make changes to this bug.