Closed Bug 1764198 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to 6827719fbb55265fba97c564afbbe6fff12a03e4

Categories

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

task

Tracking

(firefox101 fixed)

RESOLVED FIXED
101 Branch
Tracking Status
firefox101 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing error])

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 c17ea51978641e2f8f74602a080fafd93550a450 stdout: 'First, rewinding head to replay your work on top of it... Applying: Bug 1763668 [wpt PR 33555] - add a test for br { content: "" }, a=testonly Applying: Bug 1763596 [wpt PR 33547] - Report space shortage at nested column row past fragmentation line., a=testonly Applying: Bug 1762961 [wpt PR 33497] - NavigationAPI: don't reset focus if focus changed before the transition completes, a=testonly Applying: Bug 1762961 [wpt PR 33497] - Update wpt metadata, a=testonly Applying: Bug 1763595 [wpt PR 33546] - Remove invalid DCHECK in AppendNewFragmentainerGroupFromNG(), a=testonly Applying: Bug 1763442 [wpt PR 33536] - Support repeated test runs in Chromium results, a=testonly Applying: Bug 1763509 [wpt PR 33539] - Fix a flaky html/dom/render-blocking WPT, a=testonly Applying: Bug 1763509 [wpt PR 33539] - Update wpt metadata, a=testonly Using index info to reconstruct a base tree... M testing/web-platform/meta/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html.ini Falling back to patching base and 3-way merge... Auto-merging testing/web-platform/meta/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html.ini Patch failed at 0008 Bug 1763509 [wpt PR 33539] - 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.'
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(128) cmdline: git rebase 97da58eb30161f7e68987d614f1af74154434898 stdout: 'First, rewinding head to replay your work on top of it... Applying: Bug 1763668 [wpt PR 33555] - add a test for br { content: "" }, a=testonly Applying: Bug 1763596 [wpt PR 33547] - Report space shortage at nested column row past fragmentation line., a=testonly Applying: Bug 1762961 [wpt PR 33497] - NavigationAPI: don't reset focus if focus changed before the transition completes, a=testonly Applying: Bug 1762961 [wpt PR 33497] - Update wpt metadata, a=testonly Applying: Bug 1763595 [wpt PR 33546] - Remove invalid DCHECK in AppendNewFragmentainerGroupFromNG(), a=testonly Applying: Bug 1763442 [wpt PR 33536] - Support repeated test runs in Chromium results, a=testonly Applying: Bug 1763509 [wpt PR 33539] - Fix a flaky html/dom/render-blocking WPT, a=testonly Applying: Bug 1763509 [wpt PR 33539] - Update wpt metadata, a=testonly Using index info to reconstruct a base tree... M testing/web-platform/meta/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html.ini Falling back to patching base and 3-way merge... Auto-merging testing/web-platform/meta/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html.ini Patch failed at 0008 Bug 1763509 [wpt PR 33539] - 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.'
Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase This requires fixup from a wpt sync admin.
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/1764198/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/c7208ba20f9d [wpt-sync] Update web-platform-tests to 6827719fbb55265fba97c564afbbe6fff12a03e4, a=testonly
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → 101 Branch
Regressions: 1764743
You need to log in before you can comment on or make changes to this bug.