Closed Bug 1469205 Opened 7 years ago Closed 7 years ago

Update web-platform-tests to 892738fabee6bc4c7e720177f45e295fcb981b8d

Categories

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

Product:
Testing
Component:
web-platform-tests
Type:
enhancement
Priority:
Not set
Severity:
normal

Tracking

(firefox63 fixed)

Status:
RESOLVED FIXED
Milestone:
mozilla63
Tracking Flags:
Tracking Status
firefox63 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing error])

Whiteboard: [wptsync landing] → [wptsync landing error]
Pushed by james@hoppipolla.co.uk: https://hg.mozilla.org/integration/mozilla-inbound/rev/3f8d8f2c37e1 [wpt PR 11355] - Update hashchange/popstate event tests, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/18917a6e1fa7 [wpt PR 11409] - prevent overwriting of salvageable state in later prompt/unload steps, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/f5bf263c4421 [wpt PR 11410] - move to wpt, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/c9f747472a33 [wpt PR 11411] - improve spec compliance of window.close, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/4ec3179a74a4 [wpt PR 11412] - Implement read methods on FileReaderSync, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/7c351d6f780f [wpt-sync] Update web-platform-tests to 97f9d19d172ad73e50446852713e311f57490ec3, a=testonly
:jgraham the failures still occurred even after the above mentioned backout, so i backed out your whole push: https://hg.mozilla.org/integration/mozilla-inbound/rev/45cfaa4b4c0c57f0258899a8f9d21b4a12828f7c I did not edit each bug separately. All failures were on files from this revision: https://hg.mozilla.org/integration/mozilla-inbound/rev/7c351d6f780f some examples: css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html css/css-flexbox/flex-aspect-ratio-img-column-001.html domparsing/interfaces.any.htm dom/interfaces.html encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html?20001-21000 css/css-fonts/idlharness.html Bug 1469205 fetch/api/request/request-bad-port.html css/css-logical/logical-box-border-color.htm html/rendering/non-replaced-elements/tables/hidden-attr.html css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html
Pushed by archaeopteryx@coole-files.de: https://hg.mozilla.org/integration/mozilla-inbound/rev/d97405360c9a [wpt PR 11355] - Update hashchange/popstate event tests, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/9b9fc4ce9957 [wpt PR 11409] - prevent overwriting of salvageable state in later prompt/unload steps, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/f88194ff3ca1 [wpt PR 11410] - move to wpt, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/ae326fcee838 [wpt PR 11411] - improve spec compliance of window.close, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/46a22980d514 [wpt PR 11412] - Implement read methods on FileReaderSync, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/8528dc1fdf17 [wpt-sync] Update web-platform-tests to 97f9d19d172ad73e50446852713e311f57490ec3, a=testonly https://hg.mozilla.org/integration/mozilla-inbound/rev/fe94281f7c25 update expectation for logical-box-inset.html to fix unexpected pass, a=testonly
So it looks like Aryx fixed everything here. Many thanks!
Flags: needinfo?(james)
Rebase failed: Cmd('git') failed due to: exit code(128) cmdline: git rebase c60dbee994cb3f42db355405835a85c89bd484b7 stdout: 'First, rewinding head to replay your work on top of it... Applying: Bug 1466289 [wpt PR 11312] - custom-elements: Element created by createElement(name, options) with valid custom element name and options set to undefined should be upgraded, a=testonly Using index info to reconstruct a base tree... M testing/web-platform/meta/MANIFEST.json M testing/web-platform/tests/custom-elements/Document-createElement.html Falling back to patching base and 3-way merge... Auto-merging testing/web-platform/meta/MANIFEST.json CONFLICT (content): Merge conflict in testing/web-platform/meta/MANIFEST.json Patch failed at 0001 Bug 1466289 [wpt PR 11312] - custom-elements: Element created by createElement(name, options) with valid custom element name and options set to undefined should be upgraded, a=testonly The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1469205/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". ' stderr: 'error: Failed to merge in the changes.'
:jgraham please take a look at the above comment.
Flags: needinfo?(james)
It's OK, that was purely my fault :)
Flags: needinfo?(james)
(In reply to James Graham [:jgraham] from comment #12) > It's OK, that was purely my fault :) okay, thank you!
You need to log in before you can comment on or make changes to this bug.