Closed Bug 1586930 Opened 5 years ago Closed 5 years ago

Update web-platform-tests to 9f0aff8885b01a38dcce738c02c58bd66300a25d

Categories

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

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

Tracking

(firefox71 fixed)

Status:
RESOLVED FIXED
Milestone:
mozilla71
Tracking Flags:
Tracking Status
firefox71 --- fixed

People

(Reporter: mozilla.org, Unassigned)

Details

(Whiteboard: [wptsync landing])

No description provided.
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 6e561f0728c8248f8c3bda1808a383030d91c990
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1586225 - Correct spelling of fission, a=testonly
Applying: Bug 1587109 - Set initial fx_android run_info_extras from firefox desktop, r=ato
Using index info to reconstruct a base tree...
M	testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
CONFLICT (content): Merge conflict in testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
Patch failed at 0002 Bug 1587109 - Set initial fx_android run_info_extras from firefox desktop, r=ato
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.'
Retriggered failing web-platform-test tasks on try before final metadata update.
Landing push failed and rebase didn't change head:
Pushing update to remote failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git push --porcelain mozilla sync/landing/1586930/0:inbound
  stderr: 'error: failed to push some refs to 'hg::ssh://hg.mozilla.org/integration/mozilla-inbound''
Landing push failed and rebase didn't change head:
Pushing update to remote failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git push --porcelain mozilla sync/landing/1586930/0:inbound
  stderr: 'error: failed to push some refs to 'hg::ssh://hg.mozilla.org/integration/mozilla-inbound''
Landing push failed and rebase didn't change head:
Pushing update to remote failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git push --porcelain mozilla sync/landing/1586930/0:inbound
  stderr: 'error: failed to push some refs to 'hg::ssh://hg.mozilla.org/integration/mozilla-inbound''
Landing push failed and rebase didn't change head:
Pushing update to remote failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git push --porcelain mozilla sync/landing/1586930/0:inbound
  stderr: 'error: failed to push some refs to 'hg::ssh://hg.mozilla.org/integration/mozilla-inbound''
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/a4f22c5e43d7
[wpt PR 19466] - Add webkitgtk_minibrowser runs to taskcluster daily., a=testonly
https://hg.mozilla.org/integration/mozilla-inbound/rev/7dba29552629
[wpt-sync] Update web-platform-tests to 9f0aff8885b01a38dcce738c02c58bd66300a25d, a=testonly
You need to log in before you can comment on or make changes to this bug.