Don't include muxer and secure channel for webrtc (#190)

* Don't include muxer and secure channel for webrtc

* Also filter out webrtc
This commit is contained in:
Marco Munizaga 2023-06-02 18:34:28 -07:00 committed by GitHub
parent 6d55e6995c
commit fb9bb6a690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions

View File

@ -62,6 +62,7 @@ export async function buildTestSpecs(versions: Array<Version>): Promise<Array<Co
-- quic only uses its own muxer/securechannel -- quic only uses its own muxer/securechannel
AND a.transport != "webtransport" AND a.transport != "webtransport"
AND a.transport != "webrtc-direct" AND a.transport != "webrtc-direct"
AND a.transport != "webrtc"
AND a.transport != "quic" AND a.transport != "quic"
AND a.transport != "quic-v1";`); AND a.transport != "quic-v1";`);
const quicQueryResults = const quicQueryResults =
@ -85,6 +86,13 @@ export async function buildTestSpecs(versions: Array<Version>): Promise<Array<Co
AND NOT b.onlyDial AND NOT b.onlyDial
-- Only webtransport transports -- Only webtransport transports
AND a.transport == "webtransport";`); AND a.transport == "webtransport";`);
const webrtcQueryResults =
await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport
FROM transports a, transports b
WHERE a.transport == b.transport
AND NOT b.onlyDial
-- Only webrtc transports
AND a.transport == "webrtc";`);
const webrtcDirectQueryResults = const webrtcDirectQueryResults =
await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport
FROM transports a, transports b FROM transports a, transports b
@ -108,14 +116,8 @@ export async function buildTestSpecs(versions: Array<Version>): Promise<Array<Co
quicQueryResults quicQueryResults
.concat(quicV1QueryResults) .concat(quicV1QueryResults)
.concat(webtransportQueryResults) .concat(webtransportQueryResults)
.map((test): ComposeSpecification => buildSpec(containerImages, { .concat(webrtcDirectQueryResults)
name: `${test.id1} x ${test.id2} (${test.transport})`, .concat(webrtcQueryResults)
dialerID: test.id1,
listenerID: test.id2,
transport: test.transport,
extraEnv: buildExtraEnv(timeoutOverride, test.id1, test.id2)
})))
.concat(webrtcDirectQueryResults
.map((test): ComposeSpecification => buildSpec(containerImages, { .map((test): ComposeSpecification => buildSpec(containerImages, {
name: `${test.id1} x ${test.id2} (${test.transport})`, name: `${test.id1} x ${test.id2} (${test.transport})`,
dialerID: test.id1, dialerID: test.id1,