Resolve merge conflicts with upstream WebRTC web platform tests
Categories
(Core :: WebRTC, task, P2)
Tracking
()
| Tracking | Status | |
|---|---|---|
| firefox74 | --- | fixed |
People
(Reporter: bzbarsky, Assigned: bzbarsky)
References
Details
Attachments
(4 files)
See bug 1531904 comment 16. Apparently that never happened, and it's now blocking my changes in bug 1609859 from being upstreamed.
|
Assignee | |
Comment 1•4 years ago
|
||
Upstream PR at https://github.com/web-platform-tests/wpt/pull/21285 to pull in the local changes upstream does not have. Fixes coming up to pull in the changes we were missing locally.
|
|
Assignee | |
Comment 2•4 years ago
|
||
It looks like most of the changes from
https://github.com/web-platform-tests/wpt/pull/16038 we have already, except
some whitespace bits.
|
|
Assignee | |
Comment 3•4 years ago
|
||
This is a clean revert of the changes bug 1609859 made to
RTCPeerConnection-createDataChannel.html. It's separated out for review ease;
these changes are reinstated 2 changesets later.
|
|
Assignee | |
Comment 4•4 years ago
|
||
This just reapplies the changes, with some context edits because the whitespace changed.
|
|
Assignee | |
Comment 5•4 years ago
|
||
The changes are as follows:
- Add an id (and a change in the test label) in the test that now ends up
reading:
const channel = pc.createDataChannel('', { negotiated: true, id: 42 });
- Add some whitespace bits.
- Removes a bogus test (thus fixing bug 1550497). The test is bogus because
nullconverts to 0 when converting tounsigned short, and that's a
perfectly valid id value.
Compared to upstream, that leaves the following local changes:
- Tests for the "id in the unsigned short range, maybe invalid, but
'negotiated' not set" case. - A clarification for one of the test descriptions.
- Tests for the "id out of the unsigned short range" case.
These changes are upstreamed in https://github.com/web-platform-tests/wpt/pull/21285
Pushed by james@hoppipolla.co.uk: https://hg.mozilla.org/integration/autoland/rev/adfbba5ae5f7 part 1. Pull in missing upstream changes for RTCPeerConnection-ondatachannel.html. r=jgraham https://hg.mozilla.org/integration/autoland/rev/ada3f82c0181 part 2. Revert the bug 1609859 canges to RTCPeerConnection-createDataChannel.html. r=jgraham https://hg.mozilla.org/integration/autoland/rev/1ceab0b9f948 part 3. Pull in the missing upstream changes for RTCPeerConnection-createDataChannel.html. r=jgraham https://hg.mozilla.org/integration/autoland/rev/47c7a0de6fad part 4. Reinstate the changes from bug 1609859 to RTCPeerConnection-createDataChannel.html. r=jgraham
Failed to create upstream wpt PR due to merge conflicts. This requires fixup from a wpt sync admin.
|
||
Updated•4 years ago
|
|
|
||
Comment 8•4 years ago
|
||
Marked it a P2 since :bz is already working on it.
|
||
Comment 9•4 years ago
|
||
| bugherder | ||
https://hg.mozilla.org/mozilla-central/rev/adfbba5ae5f7
https://hg.mozilla.org/mozilla-central/rev/ada3f82c0181
https://hg.mozilla.org/mozilla-central/rev/1ceab0b9f948
https://hg.mozilla.org/mozilla-central/rev/47c7a0de6fad
Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/21755 for changes under testing/web-platform/tests
Upstream PR was closed without merging
Can't merge web-platform-tests PR due to failing upstream checks: Github PR https://github.com/web-platform-tests/wpt/pull/21755 * Community-TC (pull_request) (https://community-tc.services.mozilla.com/tasks/groups/c5iW-Jk4QsGT9bGI1LBr7w)
|
||
Comment 13•4 years ago
|
||
(please ignore, the bot was convinced this was in a bad state)
Upstream PR merged by moz-wptsync-bot
Description
•