Closed Bug 1712070 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to d2c5a7a075f731ecce8898ed543fe70908acd76c

Categories

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

Product:
Testing
Component:
web-platform-tests
Type:
task

Tracking

(firefox90 fixed)

Status:
RESOLVED FIXED
Milestone:
90 Branch
Tracking Flags:
Tracking Status
firefox90 --- 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 b49f2695a8d1e73e55b74fa2d27585c92c2c8631
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1711757 [wpt PR 29029] - Update hypothesis to 6.13.0, a=testonly
Applying: Bug 1710758 [wpt PR 28964] - Regenerate WPT certificates, a=testonly
Applying: Bug 1711851 [wpt PR 29039] - Make 2 passive-by-default tests tentative, a=testonly
Applying: Bug 1711851 [wpt PR 29039] - Update wpt metadata, a=testonly
Applying: Bug 1711908 [wpt PR 29042] - Delete Private Network Access IDL test, a=testonly
Applying: Bug 1711567 [wpt PR 29021] - url: expect hostname setter no-op if a port is given, a=testonly
Applying: Bug 1711800 [wpt PR 29035] - [TablesNG] Always display collapsed borders for empty cells, a=testonly
Applying: Bug 1711732 [wpt PR 29028] - [resource-timing] Fold more TAO tests into TAO-match.html, a=testonly
Applying: Bug 1711732 [wpt PR 29028] - Update wpt metadata, a=testonly
Applying: Bug 1711826 [wpt PR 29037] - Fix timeouts in WebSocket tests, a=testonly
Applying: Bug 1712070 - [wpt-sync] Update web-platform-tests to d2c5a7a075f731ecce8898ed543fe70908acd76c, a=testonly
Using index info to reconstruct a base tree...
A	testing/web-platform/meta/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html.ini
Falling back to patching base and 3-way merge...
Removing testing/web-platform/meta/resource-timing/TAO-match.html.ini
Removing testing/web-platform/meta/fetch/private-network-access/idlharness.tentative.any.js.ini
CONFLICT (modify/delete): testing/web-platform/meta/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html.ini deleted in HEAD and modified in Bug 1712070 - [wpt-sync] Update web-platform-tests to d2c5a7a075f731ecce8898ed543fe70908acd76c, a=testonly. Version Bug 1712070 - [wpt-sync] Update web-platform-tests to d2c5a7a075f731ecce8898ed543fe70908acd76c, a=testonly of testing/web-platform/meta/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html.ini left in tree.
Patch failed at 0011 Bug 1712070 - [wpt-sync] Update web-platform-tests to d2c5a7a075f731ecce8898ed543fe70908acd76c, 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-1712070-0/rebase-apply/patch:959: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1712070-0/rebase-apply/patch:1090: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1712070-0/rebase-apply/patch:1919: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
error: Failed to merge in the changes.'
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/3624ba4dc3ea
[wpt-sync] Update web-platform-tests to d2c5a7a075f731ecce8898ed543fe70908acd76c, a=testonly

https://hg.mozilla.org/mozilla-central/rev/3624ba4dc3ea

Status: NEW → RESOLVED
Closed: 3 years ago
status-firefox90: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 90 Branch
You need to log in before you can comment on or make changes to this bug.