Closed Bug 1693331 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to 2b1a71a1bb6165fc1b64a29469b3983e8c8cacb1

Categories

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

task

Tracking

(firefox88 fixed)

RESOLVED FIXED
88 Branch
Tracking Status
firefox88 --- fixed

People

(Reporter: mozilla.org, Unassigned)

References

Details

(Whiteboard: [wptsync landing])

No description provided.
Retriggered failing web-platform-test tasks on try before final metadata update.
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 035b13bc284ba4606ef21ac70e7e509a089880c1
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1693075 [wpt PR 27645] - Update interfaces/idle-detection.idl, a=testonly
Applying: Bug 1692020 [wpt PR 27576] - WPT regression test for asynchronous about:blank navigation., a=testonly
Applying: Bug 1692971 [wpt PR 27638] - WebKit export of https://bugs.webkit.org/show_bug.cgi?id=221916, a=testonly
Applying: Bug 1692971 [wpt PR 27638] - Update wpt metadata, a=testonly
Applying: Bug 1689414 [wpt PR 27369] - Simulated Clicks - send pointer down/up events, a=testonly
Applying: Bug 1693170 [wpt PR 27651] - Update interfaces/media-capabilities.idl, a=testonly
Applying: Bug 1693091 [wpt PR 27646] - [LayoutNG] Replace column break tokens during OOF fragmentation, a=testonly
Applying: Bug 1693091 [wpt PR 27646] - Update wpt metadata, a=testonly
Applying: Bug 1692633 [wpt PR 27618] - [webcodecs] Clone VideoFrame when serializing, a=testonly
Applying: Bug 1692633 [wpt PR 27618] - Update wpt metadata, a=testonly
Applying: Bug 1693182 [wpt PR 27652] - [TablesNG] Fix fixed overconstrained percentages, a=testonly
Applying: Bug 1692824 [wpt PR 27630] - Check serving constraints of WebBundle responses, a=testonly
Applying: Bug 1692477 [wpt PR 27606] - Move COOP tests to new reporting endpoint, a=testonly
Applying: Bug 1692938 [wpt PR 27637] - Increase timeout of openSXGInIframeAndWaitForMessage, a=testonly
Applying: Bug 1692689 [wpt PR 27620] - [appmanifest] Add CORS/CSP tests for icons and shortcuts, a=testonly
Applying: Bug 1689735 [wpt PR 27401] - Simulate user inputs in wpt/touch-events/multi-touch-interfaces.html, a=testonly
Applying: Bug 1689735 [wpt PR 27401] - Update wpt metadata, a=testonly
Applying: Bug 1693331 - [wpt-sync] Update web-platform-tests to 2b1a71a1bb6165fc1b64a29469b3983e8c8cacb1, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html.ini
M	testing/web-platform/meta/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html.ini
M	testing/web-platform/meta/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html.ini
Auto-merging testing/web-platform/meta/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html.ini
Auto-merging testing/web-platform/meta/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html.ini
Patch failed at 0018 Bug 1693331 - [wpt-sync] Update web-platform-tests to 2b1a71a1bb6165fc1b64a29469b3983e8c8cacb1, 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-1693331-0/rebase-apply/patch:1334: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1693331-0/rebase-apply/patch:1601: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1693331-0/rebase-apply/patch:3135: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1693331-0/rebase-apply/patch:3487: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1693331-0/rebase-apply/patch:3535: 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/e69cfd999243
[wpt-sync] Update web-platform-tests to 2b1a71a1bb6165fc1b64a29469b3983e8c8cacb1, a=testonly
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → 88 Branch
You need to log in before you can comment on or make changes to this bug.