Closed Bug 1692936 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to 4e40ddcf74f404619016b333cd47c1ac58c6bc95

Categories

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

task

Tracking

(firefox87 fixed)

RESOLVED FIXED
87 Branch
Tracking Status
firefox87 --- 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.
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase c65a8dda9805e9bc387a5c5e30ac50a31d4c35f1
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1692507 [wpt PR 27610] - Fix expectations of a recently committed test, a=testonly
Applying: Bug 1692507 [wpt PR 27610] - Update wpt metadata, a=testonly
Applying: Bug 1692478 [wpt PR 27607] - Clear reports in WPT collector when queried., a=testonly
Applying: Bug 1692488 [wpt PR 27608] - [LayoutNGTable] Cells and captions are never suitable engine boundaries., a=testonly
Applying: Bug 1692549 [wpt PR 27529] - Cleanup unnecessary `__init__.py` files, a=testonly
Applying: Bug 1692515 [wpt PR 27612] - [python3] Fix regen_certs.yml for the python3 migration, a=testonly
Applying: Bug 1692500 [wpt PR 27609] - Also map width/height to aspect-ratio for <input type=image>, a=testonly
Applying: Bug 1692511 [wpt PR 27611] - Fix paint2d-gradient.https.html, a=testonly
Applying: Bug 1690443 [wpt PR 27450] - [GridNG] Resolve both min-length & max-length for auto repetitions., a=testonly
Applying: Bug 1690443 [wpt PR 27450] - Update wpt metadata, a=testonly
Applying: Bug 1690607 [wpt PR 27461] - Portals: focus() inside portal should change active element, a=testonly
Applying: Bug 1692387 [wpt PR 27600] - webcodecs: Make AudioEncoder emit decoder config with extra_data, a=testonly
Applying: Bug 1692387 [wpt PR 27600] - Update wpt metadata, a=testonly
Applying: Bug 1692454 [wpt PR 27604] - Stricter mixed content check for blob and filesystem URLs, a=testonly
Applying: Bug 1692571 [wpt PR 27615] - Let OverflowClip instead of ScrollTranslation create layout shift root, a=testonly
Applying: Bug 1692802 [wpt PR 27626] - Fix a link in WPT quic handler README, a=testonly
Applying: Bug 1690451 [wpt PR 27452] - Support a crossorigin= attribute for webundle subresource loading, a=testonly
Applying: Bug 1692740 [wpt PR 27624] - [TablesNG] clusterfuzz empty cells crash, a=testonly
Applying: Bug 1692859 [wpt PR 27633] - Adds a test for use of datachannel after handover., a=testonly
Applying: Bug 1692859 [wpt PR 27633] - Update wpt metadata, a=testonly
Applying: Bug 1692822 [wpt PR 27629] - Adds more tests for DC availability during ICE restart, a=testonly
Applying: Bug 1692822 [wpt PR 27629] - Update wpt metadata, a=testonly
Applying: Bug 1691939 [wpt PR 27565] - Update interfaces/html.idl, a=testonly
Applying: Bug 1675508 [wpt PR 26414] - Add interfaces/idle-detection.idl and update test, a=testonly
Applying: Bug 1690670 [wpt PR 27467] - Consider transform change countering layout shift, a=testonly
Applying: Bug 1692836 [wpt PR 27631] - [TablesNG] clusterfuzz multicol causes illegal table layout trees, a=testonly
Applying: Bug 1692936 - [wpt-sync] Update web-platform-tests to 4e40ddcf74f404619016b333cd47c1ac58c6bc95, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini
A	testing/web-platform/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.source.outside.html.ini
M	testing/web-platform/meta/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
M	testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini
M	testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
Falling back to patching base and 3-way merge...
Removing testing/web-platform/meta/web-bundle/subresource-loading/subresource-loading-cross-origin.tentative.html.ini
Auto-merging testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
Auto-merging testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini
Auto-merging testing/web-platform/meta/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
Auto-merging testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini
Patch failed at 0027 Bug 1692936 - [wpt-sync] Update web-platform-tests to 4e40ddcf74f404619016b333cd47c1ac58c6bc95, 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-1692936-0/rebase-apply/patch:1940: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:1960: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:2750: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:2763: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:2789: new blank line at EOF.
+
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
error: Failed to merge in the changes.'
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 28a9c9e67e9a3cbe3d622a156ef78663cde10050
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1692507 [wpt PR 27610] - Fix expectations of a recently committed test, a=testonly
Applying: Bug 1692507 [wpt PR 27610] - Update wpt metadata, a=testonly
Applying: Bug 1692478 [wpt PR 27607] - Clear reports in WPT collector when queried., a=testonly
Applying: Bug 1692488 [wpt PR 27608] - [LayoutNGTable] Cells and captions are never suitable engine boundaries., a=testonly
Applying: Bug 1692549 [wpt PR 27529] - Cleanup unnecessary `__init__.py` files, a=testonly
Applying: Bug 1692515 [wpt PR 27612] - [python3] Fix regen_certs.yml for the python3 migration, a=testonly
Applying: Bug 1692500 [wpt PR 27609] - Also map width/height to aspect-ratio for <input type=image>, a=testonly
Applying: Bug 1692511 [wpt PR 27611] - Fix paint2d-gradient.https.html, a=testonly
Applying: Bug 1690443 [wpt PR 27450] - [GridNG] Resolve both min-length & max-length for auto repetitions., a=testonly
Applying: Bug 1690443 [wpt PR 27450] - Update wpt metadata, a=testonly
Applying: Bug 1690607 [wpt PR 27461] - Portals: focus() inside portal should change active element, a=testonly
Applying: Bug 1692387 [wpt PR 27600] - webcodecs: Make AudioEncoder emit decoder config with extra_data, a=testonly
Applying: Bug 1692387 [wpt PR 27600] - Update wpt metadata, a=testonly
Applying: Bug 1692454 [wpt PR 27604] - Stricter mixed content check for blob and filesystem URLs, a=testonly
Applying: Bug 1692571 [wpt PR 27615] - Let OverflowClip instead of ScrollTranslation create layout shift root, a=testonly
Applying: Bug 1692802 [wpt PR 27626] - Fix a link in WPT quic handler README, a=testonly
Applying: Bug 1690451 [wpt PR 27452] - Support a crossorigin= attribute for webundle subresource loading, a=testonly
Applying: Bug 1692740 [wpt PR 27624] - [TablesNG] clusterfuzz empty cells crash, a=testonly
Applying: Bug 1692859 [wpt PR 27633] - Adds a test for use of datachannel after handover., a=testonly
Applying: Bug 1692859 [wpt PR 27633] - Update wpt metadata, a=testonly
Applying: Bug 1692822 [wpt PR 27629] - Adds more tests for DC availability during ICE restart, a=testonly
Applying: Bug 1692822 [wpt PR 27629] - Update wpt metadata, a=testonly
Applying: Bug 1691939 [wpt PR 27565] - Update interfaces/html.idl, a=testonly
Applying: Bug 1675508 [wpt PR 26414] - Add interfaces/idle-detection.idl and update test, a=testonly
Applying: Bug 1690670 [wpt PR 27467] - Consider transform change countering layout shift, a=testonly
Applying: Bug 1692836 [wpt PR 27631] - [TablesNG] clusterfuzz multicol causes illegal table layout trees, a=testonly
Applying: Bug 1692936 - [wpt-sync] Update web-platform-tests to 4e40ddcf74f404619016b333cd47c1ac58c6bc95, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
Falling back to patching base and 3-way merge...
Removing testing/web-platform/meta/web-bundle/subresource-loading/subresource-loading-cross-origin.tentative.html.ini
Auto-merging testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
Patch failed at 0027 Bug 1692936 - [wpt-sync] Update web-platform-tests to 4e40ddcf74f404619016b333cd47c1ac58c6bc95, 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-1692936-0/rebase-apply/patch:1898: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:1918: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:2696: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:2709: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1692936-0/rebase-apply/patch:2735: new blank line at EOF.
+
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
error: Failed to merge in the changes.'
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/8676c79321e8
[wpt-sync] Update web-platform-tests to 4e40ddcf74f404619016b333cd47c1ac58c6bc95, a=testonly
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → 87 Branch
You need to log in before you can comment on or make changes to this bug.