Closed Bug 1741605 Opened 3 years ago Closed 2 years ago

Update web-platform-tests to 7221711f508a2da0e953030d6f420110e03c5032

Categories

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

task

Tracking

(firefox96 fixed)

RESOLVED FIXED
96 Branch
Tracking Status
firefox96 --- fixed

People

(Reporter: mozilla.org, Unassigned)

References

(Blocks 1 open bug)

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 24ef53e042bce5bc4f81b694602c09457d7a25ba
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1737066 [wpt PR 31345] - [SPC] Testdriver support for SPC, a=testonly
Applying: Bug 1737066 [wpt PR 31345] - Update wpt metadata, a=testonly
Applying: Bug 1740979 [wpt PR 31626] - Add ShadowRoot check in single node forced unlock, a=testonly
Applying: Bug 1740949 [wpt PR 31619] - Add WPT for Partitioned Service Worker matchAll, a=testonly
Applying: Bug 1740949 [wpt PR 31619] - Update wpt metadata, a=testonly
Applying: Bug 1740961 [wpt PR 31620] - [SelectMenu] Remove not needed behavior='option' from tests., a=testonly
Applying: Bug 1740838 [wpt PR 31612] - [SelectMenu] Expose validity related APIs., a=testonly
Applying: Bug 1740838 [wpt PR 31612] - Update wpt metadata, a=testonly
Applying: Bug 1739011 [wpt PR 31480] - Highlight API: Fix inheritance behavior, a=testonly
Applying: Bug 1739011 [wpt PR 31480] - Update wpt metadata, a=testonly
Applying: Bug 1741289 [wpt PR 30812] - [css-backgrounds] Add test for background-clip on multi-line inline elements, a=testonly
Applying: Bug 1741289 [wpt PR 30812] - Update wpt metadata, a=testonly
Applying: Bug 1741276 [wpt PR 31635] - Do not skip compositing update for non-animation transform changes, a=testonly
Applying: Bug 1740977 [wpt PR 31625] - [GridFragmentation] Support break-inside:avoid with MovePastBreakpoint, a=testonly
Applying: Bug 1740977 [wpt PR 31625] - Update wpt metadata, a=testonly
Applying: Bug 1740962 [wpt PR 31621] - Refactor out common partitioned service worker WPT code, a=testonly
Applying: Bug 1741329 [wpt PR 31639] - Paint: Handle nested display locks during cull rect update., a=testonly
Applying: Bug 1741376 [wpt PR 31644] - Remove crash expectation for rtp-payloadtypes on Linux, a=testonly
Applying: Bug 1728318 [wpt PR 30256] - [Azure Pipelines] Upgrade to macOS 11 (Big Sur), a=testonly
Applying: Bug 1737142 [wpt PR 31354] - fix(conformance-checkers): U+007C (|) is a forbidden host code point, a=testonly
Applying: Bug 1741407 [wpt PR 31646] - [PaymentHandler] Avoid crash from too-long icon type, a=testonly
Applying: Bug 1741278 [wpt PR 31637] - Bump hypothesis from 6.24.2 to 6.24.4 in /tools, a=testonly
Applying: Bug 1729274 [wpt PR 30357] - Update WAVE test runner, a=testonly
Applying: Bug 1734041 [wpt PR 31103] - Bump pytest-cov from 2.12.1 to 3.0.0 in /tools, a=testonly
Applying: Bug 1741335 [wpt PR 31641] - update META for gamepad + adds new reviewers, a=testonly
Applying: Bug 1741412 [wpt PR 31647] - Fix fixed-position cull rect under non-containing stacking context, a=testonly
Applying: Bug 1741461 [wpt PR 31649] - [tables] Apply nowrap attribute on <td> universally., a=testonly
Applying: Bug 1741461 [wpt PR 31649] - Update wpt metadata, a=testonly
Applying: Bug 1741551 [wpt PR 26192] - Webkit export of https://bugs.webkit.org/show_bug.cgi?id=217414, a=testonly
Applying: Bug 1741354 [wpt PR 31643] - WebKit export of https://bugs.webkit.org/show_bug.cgi?id=183994, a=testonly
Applying: Bug 1741532 [wpt PR 31655] - Extend empty and fragment only URL tests to also check cursor property, a=testonly
Applying: Bug 1740387 [wpt PR 31573] - [webtransport] Set ENABLE_CONNECT_PROTOCOL settings flag, a=testonly
Applying: Bug 1727495 [wpt PR 30169] - Test that BlinkMacSystemFont behaves as a <family-name>, a=testonly
Applying: Bug 1741605 - [wpt-sync] Update web-platform-tests to 7221711f508a2da0e953030d6f420110e03c5032, a=testonly
Using index info to reconstruct a base tree...
A	testing/web-platform/meta/webdriver/tests/new_session/create_firstMatch.py.ini
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testing/web-platform/meta/webdriver/tests/new_session/create_firstMatch.py.ini deleted in HEAD and modified in Bug 1741605 - [wpt-sync] Update web-platform-tests to 7221711f508a2da0e953030d6f420110e03c5032, a=testonly. Version Bug 1741605 - [wpt-sync] Update web-platform-tests to 7221711f508a2da0e953030d6f420110e03c5032, a=testonly of testing/web-platform/meta/webdriver/tests/new_session/create_firstMatch.py.ini left in tree.
Patch failed at 0034 Bug 1741605 - [wpt-sync] Update web-platform-tests to 7221711f508a2da0e953030d6f420110e03c5032, 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.'
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/ac180fb1fe85
[wpt-sync] Update web-platform-tests to 7221711f508a2da0e953030d6f420110e03c5032, a=testonly
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → 96 Branch
You need to log in before you can comment on or make changes to this bug.