Closed Bug 1510402 Opened 6 years ago Closed 6 years ago

Update web-platform-tests to fe0e2ce1f30ee67ed4c3be7ae420d49b48bc5749

Categories

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

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

Tracking

(firefox65 fixed)

Status:
RESOLVED FIXED
Milestone:
mozilla65
Tracking Flags:
Tracking Status
firefox65 --- fixed

People

(Reporter: mozilla.org, Unassigned)

Details

(Whiteboard: [wptsync landing]) 

      No description provided.
Retriggered failing web-platform-test tasks on try before final metadata update.
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/5893496d34c5
[wpt-sync] Update web-platform-tests to fe0e2ce1f30ee67ed4c3be7ae420d49b48bc5749, a=testonly
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 2833f38f11c79fcfa0417c476513d56ebb21d67d
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1510402 - [wpt-sync] Update web-platform-tests to fe0e2ce1f30ee67ed4c3be7ae420d49b48bc5749, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/html/browsers/the-window-object/window-properties.https.html.ini
M	testing/web-platform/meta/html/dom/interfaces.https.html.ini
M	testing/web-platform/meta/mozilla-sync
A	testing/web-platform/meta/pointerevents/pointerevent_pointermove.html.ini
M	testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini
M	testing/web-platform/meta/service-workers/service-worker/postmessage.https.html.ini
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): testing/web-platform/meta/content-security-policy/img-src/icon-blocked.sub.html.ini deleted in Bug 1510402 - [wpt-sync] Update web-platform-tests to fe0e2ce1f30ee67ed4c3be7ae420d49b48bc5749, a=testonly and renamed in HEAD. Version HEAD of testing/web-platform/meta/content-security-policy/img-src/icon-blocked.sub.html.ini left in tree.
Patch failed at 0001 Bug 1510402 - [wpt-sync] Update web-platform-tests to fe0e2ce1f30ee67ed4c3be7ae420d49b48bc5749, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1510402/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: '/app/repos/gecko/worktrees/1510402/rebase-apply/patch:22: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.'
https://hg.mozilla.org/mozilla-central/rev/5893496d34c5
Status: NEW → RESOLVED
Closed: 6 years ago
status-firefox65: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla65
You need to log in before you can comment on or make changes to this bug.