Closed Bug 1675825 Opened 5 years ago Closed 5 years ago

Update web-platform-tests to 85ffb5bed019282a8963d73937cdc38bf24920d0

Categories

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

task

Tracking

(firefox84 fixed)

RESOLVED FIXED
84 Branch
Tracking Status
firefox84 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing])

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 72d20188de97c5bc6294f9a89373e0770e695a80 stdout: 'First, rewinding head to replay your work on top of it... Applying: Bug 1675333 [wpt PR 26396] - Update interfaces/ua-client-hints.idl, a=testonly Applying: Bug 1675331 [wpt PR 26395] - Update interfaces/CSP.idl, a=testonly Applying: Bug 1675341 [wpt PR 26397] - [Critical-CH] Refactor WPTs, a=testonly Applying: Bug 1675341 [wpt PR 26397] - Update wpt metadata, a=testonly Applying: Bug 1675572 [wpt PR 26347] - [Critical-CH] Add check for unsafe HTTP methods, a=testonly Applying: Bug 1675572 [wpt PR 26347] - Update wpt metadata, a=testonly Applying: Bug 1675442 [wpt PR 26409] - [css-flex] Fix transferred size suggestion for stretched items, a=testonly Applying: Bug 1675396 [wpt PR 26403] - Let sticky elements be layout shift roots, a=testonly Applying: Bug 1675553 [wpt PR 26419] - Layout shift detection for fixed position, a=testonly Applying: Bug 1675350 [wpt PR 26398] - Change declarative Shadow DOM fragment parsing to be opt-in, a=testonly Applying: Bug 1675350 [wpt PR 26398] - Update wpt metadata, a=testonly Applying: Bug 1578343 [wpt PR 18799] - [css-text] Handling trailing ideographic spaces as regular spaces, a=testonly Applying: Bug 1578343 [wpt PR 18799] - Update wpt metadata, a=testonly Applying: Bug 1675130 [wpt PR 26388] - Ship changes to align with transform level 2 spec for grouping, a=testonly Applying: Bug 1675130 [wpt PR 26388] - Update wpt metadata, a=testonly Applying: Bug 1675692 [wpt PR 26426] - [input] Test some edge-cases for valueAsNumber with type number, a=testonly Applying: Bug 1673180 [wpt PR 26273] - Update psutil to 5.7.3, a=testonly Applying: Bug 1675713 [wpt PR 26368] - [Canvas new API] Add textRendering to Canvas new API, a=testonly Applying: Bug 1675713 [wpt PR 26368] - Update wpt metadata, a=testonly Applying: Bug 1675729 [wpt PR 26428] - Remove zcorpan as suggested_reviewers in some directories, a=testonly Applying: Bug 1675749 [wpt PR 26385] - [encoding] Add tests for GBK and gb18030 encoding, a=testonly Applying: Bug 1675467 [wpt PR 26410] - Use paragraph base direction always for trailing spaces runs., a=testonly Applying: Bug 1675575 [wpt PR 26421] - Missing value default for <animateTransform> 'type' is 'translate', a=testonly Applying: Bug 1675504 [wpt PR 26413] - [scroll-animations] Handle implicit 'auto' offsets correctly, a=testonly Applying: Bug 1675576 [wpt PR 26422] - [AspectRatio] Fix stack overflow with intrinsic max height, a=testonly Applying: Bug 1675786 [wpt PR 26432] - [wpt] Minor tweaks for MojoJS setup process, a=testonly Applying: Bug 1675825 - [wpt-sync] Update web-platform-tests to 85ffb5bed019282a8963d73937cdc38bf24920d0, a=testonly Using index info to reconstruct a base tree... A testing/web-platform/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini Falling back to patching base and 3-way merge... CONFLICT (modify/delete): testing/web-platform/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini deleted in HEAD and modified in Bug 1675825 - [wpt-sync] Update web-platform-tests to 85ffb5bed019282a8963d73937cdc38bf24920d0, a=testonly. Version Bug 1675825 - [wpt-sync] Update web-platform-tests to 85ffb5bed019282a8963d73937cdc38bf24920d0, a=testonly of testing/web-platform/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini left in tree. Removing testing/web-platform/meta/client-hints/critical-ch/unsafe-method.https.window.js.ini Patch failed at 0027 Bug 1675825 - [wpt-sync] Update web-platform-tests to 85ffb5bed019282a8963d73937cdc38bf24920d0, 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-1675825-0/rebase-apply/patch:282: new blank line at EOF. + /app/repos/gecko/worktrees/sync-landing-1675825-0/rebase-apply/patch:303: new blank line at EOF. + /app/repos/gecko/worktrees/sync-landing-1675825-0/rebase-apply/patch:326: new blank line at EOF. + /app/repos/gecko/worktrees/sync-landing-1675825-0/rebase-apply/patch:1602: new blank line at EOF. + /app/repos/gecko/worktrees/sync-landing-1675825-0/rebase-apply/patch:1612: new blank line at EOF. + warning: squelched 4 whitespace errors warning: 9 lines add whitespace errors. error: Failed to merge in the changes.'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/e40cc6272439 [wpt-sync] Update web-platform-tests to 85ffb5bed019282a8963d73937cdc38bf24920d0, a=testonly
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → 84 Branch
You need to log in before you can comment on or make changes to this bug.