Skip to content

Commit e3c2808

Browse files
committed
http2/vtc: Stabilize WR_SHUT test
If a shutdown command is last in the vtc client, it closes the file descriptor right after the shutdown, such that varnishd can not reliably send the GOAWAY, which in turn changes the H2 error message. Ref varnishcache#4283 Ref varnishcache#4284 Closes varnishcache#4293
1 parent 115da2e commit e3c2808

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

bin/varnishtest/tests/t02027.vtc

+21
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ logexpect l0 -v v1 -g vxid -q "Begin ~ sess" {
2222
client c0 {
2323
txpri
2424
shutdown -write
25+
stream 0 {
26+
rxsettings
27+
rxgoaway
28+
expect goaway.laststream == 0
29+
expect goaway.err == NO_ERROR
30+
} -run
2531
} -run
2632

2733
logexpect l1 -v v1 -g vxid -q "Begin ~ sess" {
@@ -40,6 +46,11 @@ client c1 {
4046
txreq -nohdrend
4147
} -run
4248
shutdown -write
49+
stream 0 {
50+
rxgoaway
51+
expect goaway.laststream == 1
52+
expect goaway.err == NO_ERROR
53+
} -run
4354
} -run
4455

4556
logexpect l2 -v v1 -g vxid -q "Begin ~ sess" {
@@ -58,6 +69,11 @@ client c2 {
5869
txreq -nostrend
5970
} -run
6071
shutdown -write
72+
stream 0 {
73+
rxgoaway
74+
expect goaway.laststream == 1
75+
expect goaway.err == NO_ERROR
76+
} -run
6177
} -run
6278

6379
logexpect l3 -v v1 -g vxid -q "Begin ~ sess" {
@@ -85,6 +101,11 @@ client c3 {
85101
# 00053a70617468012f00073a6d6574686f640347455400073a736368656d650468747470
86102
} -run
87103
shutdown -write
104+
stream 0 {
105+
rxgoaway
106+
expect goaway.laststream == 0
107+
expect goaway.err == NO_ERROR
108+
} -run
88109
} -run
89110

90111
logexpect l0 -wait

0 commit comments

Comments
 (0)