Closed
Bug 1673113
Opened 4 years ago
Closed 4 years ago
Update web-platform-tests to 304915c05721c2dbbf0f439618e1125b343f258a
Categories
(Testing :: web-platform-tests, task)
Testing
web-platform-tests
Tracking
(firefox84 fixed)
RESOLVED
FIXED
84 Branch
| Tracking | Status | |
|---|---|---|
| firefox84 | --- | fixed |
People
(Reporter: mozilla.org, Unassigned)
References
Details
(Whiteboard: [wptsync landing])
No description provided.
|
Assignee | |
Updated•4 years ago
|
Blocks: 1602569, 1672969, 1672468, 1672985, 1670173, 1672739, 1672549, 1672550, 1672755, 1672756, 1672765, 1673031, 1665865, 1670218, 1672017, 1672018, 1670225, 1672020, 1672021, 1672022, 1672530, 1672024, 1672025, 1672531, 1672027, 1672028, 1672532, 1672542, 1672543, 1672544, 1672545, 1672546, 1672030, 1672031, 1672032, 1672033, 1672551, 1672034, 1672035, 1672038, 1648747, 1672039, 1672040, 1672042, 1672043, 1672045, 1672555, 1672557, 1672819, 1672830, 1672835, 1672868, 1672630, 1667255, 1672887, 1672634, 1672892, 1671615, 1672133, 1672134, 1672135, 1672136, 1662666, 1672651, 1672657, 1672914, 1672658, 1672917, 1672662, 1672668, 1672535, 1672671, 1672536, 1672934, 1672537, 1672538, 1668080, 1672539, 1668343, 1672541
|
|
Assignee | |
Comment 1•4 years ago
|
||
Pushed to try https://treeherder.mozilla.org/#/jobs?repo=try&revision=ac1efd1d483cface22f55fa60dbe672a547c13a0
|
|
Assignee | |
Updated•4 years ago
|
Whiteboard: [wptsync landing] → [wptsync landing error]
|
|
Assignee | |
Comment 2•4 years ago
|
||
Landing failed due to conficts during rebase This requires fixup from a wpt sync admin.
|
|
Assignee | |
Comment 3•4 years ago
|
||
Pushed to try (stability) https://treeherder.mozilla.org/#/jobs?repo=try&revision=a6d2c4838a8349beb52a42d759b2b2717bb24002
|
|
Assignee | |
Comment 4•4 years ago
|
||
Retriggered failing web-platform-test tasks on try before final metadata update.
|
|
Assignee | |
Comment 5•4 years ago
|
||
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(128)
cmdline: git rebase 462ea9f3a9c273308e72f868665385c53dc09995
stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1671615 [wpt PR 26144] - [Canvas new API] Add textLetterSpacing and textWordSpacing, a=testonly
Applying: Bug 1671615 [wpt PR 26144] - Update wpt metadata, a=testonly
Applying: Bug 1672017 [wpt PR 26146] - [Trusted Types] Fix "sample" in CSP message for Worker constructors., a=testonly
Applying: Bug 1672018 [wpt PR 26139] - [:is/:where] Support :link/:visited, a=testonly
Applying: Bug 1672018 [wpt PR 26139] - Update wpt metadata, a=testonly
Applying: Bug 1668343 [wpt PR 25891] - Reland "[client-hints] Test client hint availability in service workers", a=testonly
Applying: Bug 1672020 [wpt PR 26156] - Update interfaces/worklets.idl, a=testonly
Applying: Bug 1672021 [wpt PR 26149] - Synchronize classList on SVGElement.className.baseVal updates, a=testonly
Applying: Bug 1672022 [wpt PR 26154] - Fix AtomicStringTable lowercase translator., a=testonly
Applying: Bug 1670173 [wpt PR 26059] - [css-flex] Fix min-height: auto for replaced elements, a=testonly
Applying: Bug 1670173 [wpt PR 26059] - Update wpt metadata, a=testonly
Applying: Bug 1672024 [wpt PR 26143] - [Canvas new API] Add FontKerning to Canvas context 2d, a=testonly
Applying: Bug 1672024 [wpt PR 26143] - Update wpt metadata, a=testonly
Applying: Bug 1672025 [wpt PR 26148] - [AspectRatio] Fix serialization of aspect-ratio, a=testonly
Applying: Bug 1672027 [wpt PR 26145] - Fix erronous ref for density-size-correction, a=testonly
Applying: Bug 1672027 [wpt PR 26145] - Update wpt metadata, a=testonly
Applying: Bug 1672028 [wpt PR 26109] - MSE-in-Workers: Cross-thread function and tests, a=testonly
Applying: Bug 1672028 [wpt PR 26109] - Update wpt metadata, a=testonly
Applying: Bug 1672030 [wpt PR 26152] - Fieldset NG: Fix relayout result of a percent-height fieldset, a=testonly
Applying: Bug 1672031 [wpt PR 26162] - Revert "Reenable scroll-animations/element-based-offset tests", a=testonly
Applying: Bug 1670225 [wpt PR 26064] - [WPT] Migrate most of import-maps resolution tests out of blink internals, a=testonly
Applying: Bug 1670225 [wpt PR 26064] - Update wpt metadata, a=testonly
Applying: Bug 1672032 [wpt PR 26150] - [:is/:where] Make is-where-error-recovery.html non-tentative, a=testonly
Applying: Bug 1672033 [wpt PR 26140] - webrtc: add wpt to test unbundled payload type demuxing, a=testonly
Applying: Bug 1672034 [wpt PR 26163] - Update interfaces/pointerlock.idl, a=testonly
Applying: Bug 1672035 [wpt PR 26164] - Update interfaces/screen-orientation.idl, a=testonly
Applying: Bug 1672038 [wpt PR 26165] - Update interfaces/webxr-hand-input.idl, a=testonly
Applying: Bug 1672039 [wpt PR 26135] - [CORS-RFC1918] Initial addressSpace Web Platform Tests., a=testonly
Applying: Bug 1672039 [wpt PR 26135] - Update wpt metadata, a=testonly
Applying: Bug 1672040 [wpt PR 26161] - [layout] Fix OOF replaced elements with display: table., a=testonly
Applying: Bug 1672042 [wpt PR 26147] - [AspectRatio] Correctly compute flex line length, a=testonly
Applying: Bug 1672042 [wpt PR 26147] - Update wpt metadata, a=testonly
Applying: Bug 1672043 [wpt PR 26151] - [:is/:where] Add WPT coverage for basic matching behavior, a=testonly
Applying: Bug 1672045 [wpt PR 26173] - Reland "Reenable scroll-animations/element-based-offset tests", a=testonly
Applying: Bug 1672133 [wpt PR 26169] - Cookies: modernize http-state directory, a=testonly
Applying: Bug 1672134 [wpt PR 26176] - [documentation] Update testdriver extension tutorial, a=testonly
Applying: Bug 1672135 [wpt PR 26174] - [AspectRatio] Remove .tentative from file names, a=testonly
Applying: Bug 1672135 [wpt PR 26174] - Update wpt metadata, a=testonly
Applying: Bug 1672136 [wpt PR 26171] - Stop referencing 'useAutomationExtension' in chrome android browsers., a=testonly
Applying: Bug 1668080 [wpt PR 25846] - [Permissions Policy] Copy existing feature policy WPT tests, a=testonly
Applying: Bug 1668080 [wpt PR 25846] - Update wpt metadata, a=testonly
Applying: Bug 1602569 [wpt PR 20685] - [docs] Document `hosts` substitution value, a=testonly
Applying: Bug 1672468 [wpt PR 26181] - [paint-timing] Move tests that use first-paint to subfolder, a=testonly
Applying: Bug 1672530 [wpt PR 26187] - [docs] Relocate recommendation on git usage, a=testonly
Applying: Bug 1672531 [wpt PR 26188] - Fix relative paths in paint-timing tests, a=testonly
Applying: Bug 1672532 [wpt PR 26125] - Implement support for ::target-text behind a flag., a=testonly
Applying: Bug 1672532 [wpt PR 26125] - Update wpt metadata, a=testonly
Applying: Bug 1672535 [wpt PR 26178] - [cssom] Add a test for media query serialization quirks., a=testonly
Applying: Bug 1667255 [wpt PR 25780] - Implement Critical-CH, a=testonly
Applying: Bug 1667255 [wpt PR 25780] - Update wpt metadata, a=testonly
Applying: Bug 1672536 [wpt PR 26179] - [Canvas new API] Add wpt tests for textLetterSpacing and textWordSpacing, a=testonly
Applying: Bug 1672537 [wpt PR 26177] - WebMediaPlayerImpl: err if no A/V in ::OnMetadata, a=testonly
Applying: Bug 1672538 [wpt PR 26196] - Fix two hyphenation tests, a=testonly
Applying: Bug 1672539 [wpt PR 26117] - blink: makes LayoutBox honor overflow-clip-margin, a=testonly
Applying: Bug 1672539 [wpt PR 26117] - Update wpt metadata, a=testonly
Applying: Bug 1672541 [wpt PR 26185] - screen enumeration: rename test to run in secure context., a=testonly
Applying: Bug 1672542 [wpt PR 26158] - Encoding: ISO-2022-JP encoder "SO/SI ESC" test, a=testonly
Applying: Bug 1672542 [wpt PR 26158] - Update wpt metadata, a=testonly
Applying: Bug 1672543 [wpt PR 26201] - Check that contain strict and content compute to the longhands, a=testonly
Applying: Bug 1672543 [wpt PR 26201] - Update wpt metadata, a=testonly
Applying: Bug 1672544 [wpt PR 26186] - Minor change on http compatibility statement, a=testonly
Applying: Bug 1672545 [wpt PR 26202] - Python3: Remove xfail for wpt unit tests in PY3, a=testonly
Applying: Bug 1672546 [wpt PR 26157] - Deflake external/wpt/infrastructure/testdriver/click_iframe_crossorigin.sub.html, a=testonly
Applying: Bug 1672549 [wpt PR 26199] - [css-flex] Add regression test for SVG sizing bug fixed in FlexNG, a=testonly
Applying: Bug 1672550 [wpt PR 26155] - [testharness.js] Fix bug in get_test_name, a=testonly
Applying: Bug 1672551 [wpt PR 26183] - webdriver: handle events with Unidentified key code, a=testonly
Applying: Bug 1662666 [wpt PR 25354] - CSS Geometry: use idl_test and .any.js, a=testonly
Applying: Bug 1662666 [wpt PR 25354] - Update wpt metadata, a=testonly
Applying: Bug 1672555 [wpt PR 26198] - [Image-Orientation] Always orient cross-origin images, a=testonly
Applying: Bug 1672557 [wpt PR 26206] - [testdriver] Binary values should be base64url, a=testonly
Applying: Bug 1672658 [wpt PR 26197] - MSE-in-Workers: Enable experimental proactive feature detection, a=testonly
Applying: Bug 1672658 [wpt PR 26197] - Update wpt metadata, a=testonly
Applying: Bug 1672662 [wpt PR 26211] - Call |HandleTrailingSpaces| even if |shape_result| is nullptr, a=testonly
Applying: Bug 1670218 [wpt PR 26063] - [WPT] Add tests for module service worker static import + path restriction, a=testonly
Applying: Bug 1670218 [wpt PR 26063] - Update wpt metadata, a=testonly
Applying: Bug 1672630 [wpt PR 26228] - html: Merge two fieldset tests, a=testonly
Applying: Bug 1672651 [wpt PR 26200] - Remove worklets.idl and let tests depend on html.idl for worklets, a=testonly
Applying: Bug 1672657 [wpt PR 26210] - CSS parsing of scrollbar-width, a=testonly
Applying: Bug 1672668 [wpt PR 26184] - Python 3: replace deprecated Assertregexpmatches use for Py3, a=testonly
Applying: Bug 1672671 [wpt PR 26182] - Python 3: Remove xfail comments, a=testonly
Applying: Bug 1672755 [wpt PR 26212] - bluetooth: Fix tests which assume cross-origin user activation, a=testonly
Applying: Bug 1672756 [wpt PR 7942] - Handle spaces in path in |wpt test-files|, a=testonly
Applying: Bug 1672765 [wpt PR 26209] - Reland "[Longtasks] Fix buffering before observer", a=testonly
Applying: Bug 1665865 [wpt PR 25617] - [mathml] Implement special drawing of largeop operator in displaystyle, a=testonly
Applying: Bug 1665865 [wpt PR 25617] - Update wpt metadata, a=testonly
Applying: Bug 1672739 [wpt PR 26236] - Make schemeful websocket test more robust, a=testonly
Applying: Bug 1672739 [wpt PR 26236] - Update wpt metadata, a=testonly
Applying: Bug 1672634 [wpt PR 26229] - Fix line cache when `-webkit-line-clamp` is specified, a=testonly
Applying: Bug 1672819 [wpt PR 26086] - Check that CSS.supports and CSSStyleDeclaration agree, a=testonly
Applying: Bug 1672830 [wpt PR 26204] - Document expectations for usage of new JS features, a=testonly
Applying: Bug 1672835 [wpt PR 26242] - Remove sorting and de-duplication in media queries., a=testonly
Applying: Bug 1672892 [wpt PR 26193] - HTMLPluginElement: Add object to frame view's update part if locked., a=testonly
Applying: Bug 1672868 [wpt PR 26244] - Update Safari Technology Preview to 115, a=testonly
Applying: Bug 1672887 [wpt PR 26246] - Fix Canvas drawImage tests not to expect INDEX_SIZE_ERR when source width/height is zero (fixes #2835), a=testonly
Applying: Bug 1672887 [wpt PR 26246] - Update wpt metadata, a=testonly
Applying: Bug 1672934 [wpt PR 26214] - [beacon] Fix ArrayBuffer and URLSearchParams data, a=testonly
Applying: Bug 1672914 [wpt PR 26248] - Fix NGLineBreaker::RewindOverflow crash, a=testonly
Applying: Bug 1672917 [wpt PR 26249] - Update interfaces/webhid.idl, a=testonly
Applying: Bug 1672969 [wpt PR 26254] - Revert "[mathml] Implement special drawing of largeop operator in displaystyle", a=testonly
Applying: Bug 1672985 [wpt PR 26256] - Tweak flexbox_justifycontent-center-overflow.html to match implementations, a=testonly
Applying: Bug 1672985 [wpt PR 26256] - Update wpt metadata, a=testonly
Applying: Bug 1673031 [wpt PR 26262] - Remove invalid relative import in vcs.py, a=testonly
Applying: Bug 1648747 [wpt PR 24357] - webrtc: add WPT test for handling of unknown media types, a=testonly
Applying: Bug 1648747 [wpt PR 24357] - Update wpt metadata, a=testonly
Applying: Bug 1673113 - [wpt-sync] Update web-platform-tests to 304915c05721c2dbbf0f439618e1125b343f258a, a=testonly
Using index info to reconstruct a base tree...
M testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/screen_enumeration/screen_enumeration_permission.https.window.js.ini
Auto-merging testing/web-platform/meta/paint-timing/with-first-paint/first-contentful-image.html.ini
Removing testing/web-platform/meta/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002.html.ini
Removing testing/web-platform/meta/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
Auto-merging testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini
Removing testing/web-platform/meta/custom-elements/reactions/__dir__.ini
Removing testing/web-platform/meta/css/selectors/is-where-error-recovery.tentative.html.ini
Removing testing/web-platform/meta/css/cssom/serialize-media-rule.html.ini
Removing testing/web-platform/meta/css/cssom/medialist-interfaces-003.html.ini
Removing testing/web-platform/meta/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html.ini
Patch failed at 0105 Bug 1673113 - [wpt-sync] Update web-platform-tests to 304915c05721c2dbbf0f439618e1125b343f258a, 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-1673113-0/rebase-apply/patch:2198: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2219: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2374: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2453: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2463: new blank line at EOF.
+
warning: squelched 24 whitespace errors
warning: 29 lines add whitespace errors.
error: Failed to merge in the changes.'|
|
Assignee | |
Comment 6•4 years ago
|
||
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(128)
cmdline: git rebase ed738d65bc3f9e388a050b7e721ee26e83b9fd13
stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1671615 [wpt PR 26144] - [Canvas new API] Add textLetterSpacing and textWordSpacing, a=testonly
Applying: Bug 1671615 [wpt PR 26144] - Update wpt metadata, a=testonly
Applying: Bug 1672017 [wpt PR 26146] - [Trusted Types] Fix "sample" in CSP message for Worker constructors., a=testonly
Applying: Bug 1672018 [wpt PR 26139] - [:is/:where] Support :link/:visited, a=testonly
Applying: Bug 1672018 [wpt PR 26139] - Update wpt metadata, a=testonly
Applying: Bug 1668343 [wpt PR 25891] - Reland "[client-hints] Test client hint availability in service workers", a=testonly
Applying: Bug 1672020 [wpt PR 26156] - Update interfaces/worklets.idl, a=testonly
Applying: Bug 1672021 [wpt PR 26149] - Synchronize classList on SVGElement.className.baseVal updates, a=testonly
Applying: Bug 1672022 [wpt PR 26154] - Fix AtomicStringTable lowercase translator., a=testonly
Applying: Bug 1670173 [wpt PR 26059] - [css-flex] Fix min-height: auto for replaced elements, a=testonly
Applying: Bug 1670173 [wpt PR 26059] - Update wpt metadata, a=testonly
Applying: Bug 1672024 [wpt PR 26143] - [Canvas new API] Add FontKerning to Canvas context 2d, a=testonly
Applying: Bug 1672024 [wpt PR 26143] - Update wpt metadata, a=testonly
Applying: Bug 1672025 [wpt PR 26148] - [AspectRatio] Fix serialization of aspect-ratio, a=testonly
Applying: Bug 1672027 [wpt PR 26145] - Fix erronous ref for density-size-correction, a=testonly
Applying: Bug 1672027 [wpt PR 26145] - Update wpt metadata, a=testonly
Applying: Bug 1672028 [wpt PR 26109] - MSE-in-Workers: Cross-thread function and tests, a=testonly
Applying: Bug 1672028 [wpt PR 26109] - Update wpt metadata, a=testonly
Applying: Bug 1672030 [wpt PR 26152] - Fieldset NG: Fix relayout result of a percent-height fieldset, a=testonly
Applying: Bug 1672031 [wpt PR 26162] - Revert "Reenable scroll-animations/element-based-offset tests", a=testonly
Applying: Bug 1670225 [wpt PR 26064] - [WPT] Migrate most of import-maps resolution tests out of blink internals, a=testonly
Applying: Bug 1670225 [wpt PR 26064] - Update wpt metadata, a=testonly
Applying: Bug 1672032 [wpt PR 26150] - [:is/:where] Make is-where-error-recovery.html non-tentative, a=testonly
Applying: Bug 1672033 [wpt PR 26140] - webrtc: add wpt to test unbundled payload type demuxing, a=testonly
Applying: Bug 1672034 [wpt PR 26163] - Update interfaces/pointerlock.idl, a=testonly
Applying: Bug 1672035 [wpt PR 26164] - Update interfaces/screen-orientation.idl, a=testonly
Applying: Bug 1672038 [wpt PR 26165] - Update interfaces/webxr-hand-input.idl, a=testonly
Applying: Bug 1672039 [wpt PR 26135] - [CORS-RFC1918] Initial addressSpace Web Platform Tests., a=testonly
Applying: Bug 1672039 [wpt PR 26135] - Update wpt metadata, a=testonly
Applying: Bug 1672040 [wpt PR 26161] - [layout] Fix OOF replaced elements with display: table., a=testonly
Applying: Bug 1672042 [wpt PR 26147] - [AspectRatio] Correctly compute flex line length, a=testonly
Applying: Bug 1672042 [wpt PR 26147] - Update wpt metadata, a=testonly
Applying: Bug 1672043 [wpt PR 26151] - [:is/:where] Add WPT coverage for basic matching behavior, a=testonly
Applying: Bug 1672045 [wpt PR 26173] - Reland "Reenable scroll-animations/element-based-offset tests", a=testonly
Applying: Bug 1672133 [wpt PR 26169] - Cookies: modernize http-state directory, a=testonly
Applying: Bug 1672134 [wpt PR 26176] - [documentation] Update testdriver extension tutorial, a=testonly
Applying: Bug 1672135 [wpt PR 26174] - [AspectRatio] Remove .tentative from file names, a=testonly
Applying: Bug 1672135 [wpt PR 26174] - Update wpt metadata, a=testonly
Applying: Bug 1672136 [wpt PR 26171] - Stop referencing 'useAutomationExtension' in chrome android browsers., a=testonly
Applying: Bug 1668080 [wpt PR 25846] - [Permissions Policy] Copy existing feature policy WPT tests, a=testonly
Applying: Bug 1668080 [wpt PR 25846] - Update wpt metadata, a=testonly
Applying: Bug 1602569 [wpt PR 20685] - [docs] Document `hosts` substitution value, a=testonly
Applying: Bug 1672468 [wpt PR 26181] - [paint-timing] Move tests that use first-paint to subfolder, a=testonly
Applying: Bug 1672530 [wpt PR 26187] - [docs] Relocate recommendation on git usage, a=testonly
Applying: Bug 1672531 [wpt PR 26188] - Fix relative paths in paint-timing tests, a=testonly
Applying: Bug 1672532 [wpt PR 26125] - Implement support for ::target-text behind a flag., a=testonly
Applying: Bug 1672532 [wpt PR 26125] - Update wpt metadata, a=testonly
Applying: Bug 1672535 [wpt PR 26178] - [cssom] Add a test for media query serialization quirks., a=testonly
Applying: Bug 1667255 [wpt PR 25780] - Implement Critical-CH, a=testonly
Applying: Bug 1667255 [wpt PR 25780] - Update wpt metadata, a=testonly
Applying: Bug 1672536 [wpt PR 26179] - [Canvas new API] Add wpt tests for textLetterSpacing and textWordSpacing, a=testonly
Applying: Bug 1672537 [wpt PR 26177] - WebMediaPlayerImpl: err if no A/V in ::OnMetadata, a=testonly
Applying: Bug 1672538 [wpt PR 26196] - Fix two hyphenation tests, a=testonly
Applying: Bug 1672539 [wpt PR 26117] - blink: makes LayoutBox honor overflow-clip-margin, a=testonly
Applying: Bug 1672539 [wpt PR 26117] - Update wpt metadata, a=testonly
Applying: Bug 1672541 [wpt PR 26185] - screen enumeration: rename test to run in secure context., a=testonly
Applying: Bug 1672542 [wpt PR 26158] - Encoding: ISO-2022-JP encoder "SO/SI ESC" test, a=testonly
Applying: Bug 1672542 [wpt PR 26158] - Update wpt metadata, a=testonly
Applying: Bug 1672543 [wpt PR 26201] - Check that contain strict and content compute to the longhands, a=testonly
Applying: Bug 1672543 [wpt PR 26201] - Update wpt metadata, a=testonly
Applying: Bug 1672544 [wpt PR 26186] - Minor change on http compatibility statement, a=testonly
Applying: Bug 1672545 [wpt PR 26202] - Python3: Remove xfail for wpt unit tests in PY3, a=testonly
Applying: Bug 1672546 [wpt PR 26157] - Deflake external/wpt/infrastructure/testdriver/click_iframe_crossorigin.sub.html, a=testonly
Applying: Bug 1672549 [wpt PR 26199] - [css-flex] Add regression test for SVG sizing bug fixed in FlexNG, a=testonly
Applying: Bug 1672550 [wpt PR 26155] - [testharness.js] Fix bug in get_test_name, a=testonly
Applying: Bug 1672551 [wpt PR 26183] - webdriver: handle events with Unidentified key code, a=testonly
Applying: Bug 1662666 [wpt PR 25354] - CSS Geometry: use idl_test and .any.js, a=testonly
Applying: Bug 1662666 [wpt PR 25354] - Update wpt metadata, a=testonly
Applying: Bug 1672555 [wpt PR 26198] - [Image-Orientation] Always orient cross-origin images, a=testonly
Applying: Bug 1672557 [wpt PR 26206] - [testdriver] Binary values should be base64url, a=testonly
Applying: Bug 1672658 [wpt PR 26197] - MSE-in-Workers: Enable experimental proactive feature detection, a=testonly
Applying: Bug 1672658 [wpt PR 26197] - Update wpt metadata, a=testonly
Applying: Bug 1672662 [wpt PR 26211] - Call |HandleTrailingSpaces| even if |shape_result| is nullptr, a=testonly
Applying: Bug 1670218 [wpt PR 26063] - [WPT] Add tests for module service worker static import + path restriction, a=testonly
Applying: Bug 1670218 [wpt PR 26063] - Update wpt metadata, a=testonly
Applying: Bug 1672630 [wpt PR 26228] - html: Merge two fieldset tests, a=testonly
Applying: Bug 1672651 [wpt PR 26200] - Remove worklets.idl and let tests depend on html.idl for worklets, a=testonly
Applying: Bug 1672657 [wpt PR 26210] - CSS parsing of scrollbar-width, a=testonly
Applying: Bug 1672668 [wpt PR 26184] - Python 3: replace deprecated Assertregexpmatches use for Py3, a=testonly
Applying: Bug 1672671 [wpt PR 26182] - Python 3: Remove xfail comments, a=testonly
Applying: Bug 1672755 [wpt PR 26212] - bluetooth: Fix tests which assume cross-origin user activation, a=testonly
Applying: Bug 1672756 [wpt PR 7942] - Handle spaces in path in |wpt test-files|, a=testonly
Applying: Bug 1672765 [wpt PR 26209] - Reland "[Longtasks] Fix buffering before observer", a=testonly
Applying: Bug 1665865 [wpt PR 25617] - [mathml] Implement special drawing of largeop operator in displaystyle, a=testonly
Applying: Bug 1665865 [wpt PR 25617] - Update wpt metadata, a=testonly
Applying: Bug 1672739 [wpt PR 26236] - Make schemeful websocket test more robust, a=testonly
Applying: Bug 1672739 [wpt PR 26236] - Update wpt metadata, a=testonly
Applying: Bug 1672634 [wpt PR 26229] - Fix line cache when `-webkit-line-clamp` is specified, a=testonly
Applying: Bug 1672819 [wpt PR 26086] - Check that CSS.supports and CSSStyleDeclaration agree, a=testonly
Applying: Bug 1672830 [wpt PR 26204] - Document expectations for usage of new JS features, a=testonly
Applying: Bug 1672835 [wpt PR 26242] - Remove sorting and de-duplication in media queries., a=testonly
Applying: Bug 1672892 [wpt PR 26193] - HTMLPluginElement: Add object to frame view's update part if locked., a=testonly
Applying: Bug 1672868 [wpt PR 26244] - Update Safari Technology Preview to 115, a=testonly
Applying: Bug 1672887 [wpt PR 26246] - Fix Canvas drawImage tests not to expect INDEX_SIZE_ERR when source width/height is zero (fixes #2835), a=testonly
Applying: Bug 1672887 [wpt PR 26246] - Update wpt metadata, a=testonly
Applying: Bug 1672934 [wpt PR 26214] - [beacon] Fix ArrayBuffer and URLSearchParams data, a=testonly
Applying: Bug 1672914 [wpt PR 26248] - Fix NGLineBreaker::RewindOverflow crash, a=testonly
Applying: Bug 1672917 [wpt PR 26249] - Update interfaces/webhid.idl, a=testonly
Applying: Bug 1672969 [wpt PR 26254] - Revert "[mathml] Implement special drawing of largeop operator in displaystyle", a=testonly
Applying: Bug 1672985 [wpt PR 26256] - Tweak flexbox_justifycontent-center-overflow.html to match implementations, a=testonly
Applying: Bug 1672985 [wpt PR 26256] - Update wpt metadata, a=testonly
Applying: Bug 1673031 [wpt PR 26262] - Remove invalid relative import in vcs.py, a=testonly
Applying: Bug 1648747 [wpt PR 24357] - webrtc: add WPT test for handling of unknown media types, a=testonly
Applying: Bug 1648747 [wpt PR 24357] - Update wpt metadata, a=testonly
Applying: Bug 1673113 - [wpt-sync] Update web-platform-tests to 304915c05721c2dbbf0f439618e1125b343f258a, a=testonly
Using index info to reconstruct a base tree...
M testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
Auto-merging testing/web-platform/meta/screen_enumeration/screen_enumeration_permission.https.window.js.ini
Auto-merging testing/web-platform/meta/paint-timing/with-first-paint/first-contentful-image.html.ini
Removing testing/web-platform/meta/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002.html.ini
Removing testing/web-platform/meta/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
Removing testing/web-platform/meta/custom-elements/reactions/__dir__.ini
Removing testing/web-platform/meta/css/selectors/is-where-error-recovery.tentative.html.ini
Removing testing/web-platform/meta/css/cssom/serialize-media-rule.html.ini
Removing testing/web-platform/meta/css/cssom/medialist-interfaces-003.html.ini
Removing testing/web-platform/meta/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html.ini
Patch failed at 0105 Bug 1673113 - [wpt-sync] Update web-platform-tests to 304915c05721c2dbbf0f439618e1125b343f258a, 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-1673113-0/rebase-apply/patch:2198: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2219: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2354: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2433: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1673113-0/rebase-apply/patch:2443: new blank line at EOF.
+
warning: squelched 24 whitespace errors
warning: 29 lines add whitespace errors.
error: Failed to merge in the changes.'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/8a8b731f9ae3 [wpt-sync] Update web-platform-tests to 304915c05721c2dbbf0f439618e1125b343f258a, a=testonly
Pushed by archaeopteryx@coole-files.de: https://hg.mozilla.org/integration/autoland/rev/a2908283db41 set css/CSS2/text/text-transform-bicameral-001.xht also as fuzzy on Windows 7 opt. DONTBUILD CLOSED TREE
|
||
Comment 9•4 years ago
|
||
| bugherder | ||
https://hg.mozilla.org/mozilla-central/rev/8a8b731f9ae3
https://hg.mozilla.org/mozilla-central/rev/a2908283db41
Status: NEW → RESOLVED
Closed: 4 years ago
status-firefox84:
--- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 84 Branch
|
|
Assignee | |
Updated•4 years ago
|
Whiteboard: [wptsync landing error] → [wptsync landing]
You need to log in
before you can comment on or make changes to this bug.
Description
•