Skip to content

Commit

Permalink
Update interop testing (#52)
Browse files Browse the repository at this point in the history
* Update interop testing
- Add .dockerignore
- Add lsquic to interop testing matrix
- Fix issues found by interop testing

* update tquic-interop.yml
  • Loading branch information
iyangsj authored Nov 24, 2023
1 parent 513a326 commit 6ae90a8
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
website/
fuzz/
include/
target/
!target/release/tquic_client
!target/release/tquic_server
.git/
.github/
13 changes: 11 additions & 2 deletions .github/workflows/tquic-interop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,18 @@ env:

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
server: [tquic]
client: [tquic]
include:
- server: tquic
client: lsquic
- server: lsquic
client: tquic

steps:
- uses: actions/checkout@v4
with:
Expand All @@ -37,4 +46,4 @@ jobs:
- name: Run the interop tests
run: |
cd quic-interop-runner
python3 run.py -s tquic -c tquic -t handshake,retry,resumption,http3,ipv6,transfer,multiplexing,longrtt,blackhole,transferloss,transfercorruption,goodput,crosstraffic -d -r tquic=tquic_interop:v1
python3 run.py -s ${{ matrix.server }} -c ${{ matrix.client }} -t handshake,retry,resumption,http3,ipv6,transfer,multiplexing,longrtt,blackhole,transferloss,transfercorruption,goodput,crosstraffic -d -r tquic=tquic_interop:v1
5 changes: 5 additions & 0 deletions interop/run_endpoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,21 @@ if [ "$ROLE" == "client" ]; then
REQS=($REQUESTS)

CLIENT_ARGS="--dump-path ${DOWNLOAD_DIR} --keylog-file $SSLKEYLOGFILE --log-level TRACE --max-concurrent-requests ${#REQS[@]}"
CLIENT_ALPN="--alpn hq-interop"
case $TESTCASE in
resumption)
CLIENT_ARGS="$CLIENT_ARGS --session-file=session.bin"
;;
zerortt)
CLIENT_ARGS="$CLIENT_ARGS --session-file=session.bin --enable-early-data"
;;
http3)
CLIENT_ALPN="--alpn h3"
;;
*)
;;
esac
CLIENT_ARGS="$CLIENT_ARGS $CLIENT_ALPN"

case $TESTCASE in
multiconnect|resumption)
Expand Down
2 changes: 1 addition & 1 deletion src/connection/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1463,7 +1463,7 @@ impl Connection {
scid,
pkt_num: 0,
pkt_num_len,
token: if pkt_type == PacketType::Initial {
token: if !self.is_server && pkt_type == PacketType::Initial {
// Note: Retry packet is not sent by send_packet()
self.token.clone()
} else {
Expand Down

0 comments on commit 6ae90a8

Please sign in to comment.