Closed Bug 1683965 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to ae4e6613d0daa8846d48ff8673821ac00efc50f4

Categories

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

Product:
Testing
Component:
web-platform-tests
Type:
task

Tracking

(firefox86 fixed)

Status:
RESOLVED FIXED
Milestone:
86 Branch
Tracking Flags:
Tracking Status
firefox86 --- fixed

People

(Reporter: mozilla.org, Unassigned)

References

Details

(Whiteboard: [wptsync landing error])

No description provided.
Retriggered failing web-platform-test tasks on try before final metadata update.
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 6ed3318ae2ec4f609e33a6f28d7b1b8d1259ff58
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1683825 [wpt PR 26982] - [wpt] tests were failing because of font aliasing, a=testonly
Applying: Bug 1683825 [wpt PR 26982] - Update wpt metadata, a=testonly
Applying: Bug 1683833 [wpt PR 26983] - Add further META.yml files to ease specs to WPT mapping, a=testonly
Applying: Bug 1683855 [wpt PR 26987] - Add tests to check logical properties work in WebKit non-standard "-webkit-writing-mode: horizontal-bt", a=testonly
Applying: Bug 1683864 [wpt PR 26988] - Update interfaces/dom.idl, a=testonly
Applying: Bug 1683726 [wpt PR 26975] - Re-disable stash tests when using spawn-based multiprocessing, a=testonly
Applying: Bug 1683965 - [wpt-sync] Update web-platform-tests to ae4e6613d0daa8846d48ff8673821ac00efc50f4, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
Removing testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-023.xht.ini
Removing testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-022.xht.ini
Removing testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-021.xht.ini
Patch failed at 0007 Bug 1683965 - [wpt-sync] Update web-platform-tests to ae4e6613d0daa8846d48ff8673821ac00efc50f4, a=testonly
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
'
  stderr: '/app/repos/gecko/worktrees/sync-landing-1683965-0/rebase-apply/patch:2388: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1683965-0/rebase-apply/patch:2581: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1683965-0/rebase-apply/patch:2592: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1683965-0/rebase-apply/patch:4049: new blank line at EOF.
+
warning: 4 lines add whitespace errors.
error: Failed to merge in the changes.'
Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase
This requires fixup from a wpt sync admin.
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/e7ed18158862
[wpt-sync] Update web-platform-tests to ae4e6613d0daa8846d48ff8673821ac00efc50f4, a=testonly

https://hg.mozilla.org/mozilla-central/rev/e7ed18158862

Status: NEW → RESOLVED
Closed: 3 years ago
status-firefox86: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 86 Branch
You need to log in before you can comment on or make changes to this bug.