Closed Bug 1769887 Opened 2 years ago Closed 2 years ago

Update web-platform-tests to dd05a4454ef3e76677d1191823b34420f3ea9355

Categories

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

task

Tracking

(firefox102 fixed)

RESOLVED FIXED
102 Branch
Tracking Status
firefox102 --- 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.
Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase
This requires fixup from a wpt sync admin.
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 6468037814d4fb37a16fd57f5fc301b45ada6176
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: no bug - Bumping Firefox l10n changesets r=release a=l10n-bump DONTBUILD
Applying: Bug 1769120 [wpt PR 34046] - [@container] Properly invalidate container-relative units in gradients, a=testonly
Applying: Bug 1769120 [wpt PR 34046] - Update wpt metadata, a=testonly
Applying: Bug 1769536 [wpt PR 34072] - Fix exception type of WebAssembly.Global for v128, a=testonly
Applying: Bug 1769520 [wpt PR 34070] - [@container] LayoutReplaced handled by LayoutNG, a=testonly
Applying: Bug 1769507 [wpt PR 34067] - Add wpt tests for tree-structural pseudo classes inside :has(), a=testonly
Applying: Bug 1769507 [wpt PR 34067] - Update wpt metadata, a=testonly
Applying: Bug 1769519 [wpt PR 34069] - [Trusted Types] Get list of event handlers from WebIDL, a=testonly
Applying: Bug 1768646 [wpt PR 34018] - [mq-4] Enable CSSMediaQueries4 for stable, a=testonly
Applying: Bug 1768646 [wpt PR 34018] - Update wpt metadata, a=testonly
Applying: Bug 1769587 [wpt PR 34076] - [Safari] Sending SIGKILL isn't actually atomic with the actual kill, a=testonly
Applying: Bug 1769590 [wpt PR 34077] - Rename expression_should_[not_]be_parseable, a=testonly
Applying: Bug 1769590 [wpt PR 34077] - Update wpt metadata, a=testonly
Applying: Bug 1769170 [wpt PR 34049] - Async clipboard APIs should not trigger image loading, a=testonly
Applying: Bug 1769170 [wpt PR 34049] - Update wpt metadata, a=testonly
Applying: Bug 1769134 [wpt PR 34048] - Reland "Avoid unnecessary calls to paint invalidation", a=testonly
Applying: Bug 1769667 [wpt PR 28065] - [WPT] Add more type/language tests for script elements, a=testonly
Applying: Bug 1769667 [wpt PR 28065] - Update wpt metadata, a=testonly
Applying: Bug 1762235 [wpt PR 33424] - [Bluetooth] Implement Permissions-Policy API Integration, a=testonly
Applying: Bug 1762235 [wpt PR 33424] - Update wpt metadata, a=testonly
Applying: Bug 1766690 [wpt PR 33820] - [WPT] Fix flakiness in /preload/preload-error.sub.html on Firefox, a=testonly
Applying: Bug 1766690 [wpt PR 33820] - Update wpt metadata, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/preload/preload-error.sub.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/preload/preload-error.sub.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/preload/preload-error.sub.html.ini
Patch failed at 0022 Bug 1766690 [wpt PR 33820] - Update wpt metadata, 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: 'error: Failed to merge in the changes.'
Landing push failed and rebase didn't change head:
Pushing update to remote failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git push --porcelain mozilla sync/landing/1769887/0:branches/default/tip
  stderr: 'error: failed to push some refs to 'hg::ssh://hg.mozilla.org/integration/autoland''
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/28d8297085fe
[wpt-sync] Update web-platform-tests to dd05a4454ef3e76677d1191823b34420f3ea9355, a=testonly
Whiteboard: [wptsync landing error] → [wptsync landing]
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Whiteboard: [wptsync landing] → [wptsync landing error]
Target Milestone: --- → 102 Branch
You need to log in before you can comment on or make changes to this bug.