1610422 - Resolve merge conflicts with upstream WebRTC web platform tests

Status: RESOLVED FIXED

(Core :: WebRTC, task, P2)

Description

[Boris Zbarsky [:bzbarsky]]

See bug 1531904 comment 16. Apparently that never happened, and it's now blocking my changes in bug 1609859 from being upstreamed.

Comment 1

[Boris Zbarsky [:bzbarsky]]

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.

Comment 2

[Boris Zbarsky [:bzbarsky]]

Attachment: Bug 1610422 part 1. Pull in missing upstream changes for RTCPeerConnection-ondatachannel.html. r=jgraham

It looks like most of the changes from
https://github.com/web-platform-tests/wpt/pull/16038 we have already, except
some whitespace bits.

Comment 3

[Boris Zbarsky [:bzbarsky]]

Attachment: Bug 1610422 part 2. Revert the bug 1609859 canges to RTCPeerConnection-createDataChannel.html. r=jgraham

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.

Comment 4

[Boris Zbarsky [:bzbarsky]]

Attachment: Bug 1610422 part 4. Reinstate the changes from bug 1609859 to RTCPeerConnection-createDataChannel.html. r=jgraham

This just reapplies the changes, with some context edits because the whitespace changed.

Comment 5

[Boris Zbarsky [:bzbarsky]]

Attachment: Bug 1610422 part 3. Pull in the missing upstream changes for RTCPeerConnection-createDataChannel.html. r=graham

The changes are as follows:

1. 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 });

2. Add some whitespace bits.
3. Removes a bogus test (thus fixing bug 1550497). The test is bogus because
   null converts to 0 when converting to unsigned 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

Comment 6

[Pulsebot]

Pushed by [e-mail]:
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

Comment 7

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Failed to create upstream wpt PR due to merge conflicts. This requires fixup from a wpt sync admin.

Comment 8

[Michael Froman [:mjf]]

Marked it a P2 since :bz is already working on it.

Comment 9

[Stefan Hindli [:stefan_hindli]]

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

Comment 10

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/21755 for changes under testing/web-platform/tests

Comment 11

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Upstream PR was closed without merging

Comment 12

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

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

[James Graham [:jgraham]]

(please ignore, the bot was convinced this was in a bad state)

Comment 14

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Upstream PR merged by moz-wptsync-bot