Skip to content

Commit 87b0c94

Browse files
jfallowsclaude
jfallows
and
claude
committed
test(command-dump): enable shouldReceiveClientSentRedirect
Pair the redirect rpt scripts with `read abort` (client) and `write aborted` (server) so post-REDIRECT teardown is deterministic once the k3po-zilla transport aligns REDIRECT with RESET (#13ad202a1). Add the tshark fixture and unignore the IT method. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 13ad202 commit 87b0c94

4 files changed

Lines changed: 217 additions & 2 deletions

File tree

‎incubator/command-dump/src/main/scripts/io/aklivity/zilla/runtime/command/dump/binding/ws/streams/application/advise/client.sent.redirect/client.rpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ write zilla:begin.ext ${ws:beginEx()
3030
connected
3131

3232
write advised zilla:redirect 0x00000000000000b1L
33+
34+
read abort

‎incubator/command-dump/src/main/scripts/io/aklivity/zilla/runtime/command/dump/binding/ws/streams/application/advise/client.sent.redirect/server.rpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ read zilla:begin.ext ${ws:beginEx()
3030
connected
3131

3232
read advise zilla:redirect 0x00000000000000b1L
33+
34+
write aborted

‎incubator/command-dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/WsAdvisoryApplicationIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static java.util.concurrent.TimeUnit.SECONDS;
1818
import static org.junit.rules.RuleChain.outerRule;
1919

20-
import org.junit.Ignore;
2120
import org.junit.Rule;
2221
import org.junit.Test;
2322
import org.junit.rules.DisableOnDebug;
@@ -51,7 +50,6 @@ public void shouldReceiveClientSentChallenge() throws Exception
5150
k3po.finish();
5251
}
5352

54-
@Ignore("Pending regeneration of WsAdvisoryApplicationIT_shouldReceiveClientSentRedirect.txt via tshark")
5553
@Test
5654
@Specification({
5755
"${app}/client.sent.redirect/client",

‎incubator/command-dump/src/test/resources/io/aklivity/zilla/runtime/command/dump/internal/WsAdvisoryApplicationIT_shouldReceiveClientSentRedirect.txt‎

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
Frame 1: 241 bytes on wire (1928 bits), 241 bytes captured (1928 bits)
2+
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
3+
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
4+
Transmission Control Protocol, Src Port: 37114, Dst Port: 7114, Seq: 1, Ack: 1, Len: 167
5+
Zilla Frame
6+
Frame Type ID: 0x00000001
7+
Frame Type: BEGIN
8+
Protocol Type ID: 0x00000000
9+
Protocol Type:
10+
Worker: 0
11+
Offset: 0x00000000
12+
Origin ID: 0x0000000100000002
13+
Origin Namespace: test
14+
Origin Binding: app0
15+
Routed ID: 0x0000000100000002
16+
Routed Namespace: test
17+
Routed Binding: app0
18+
Stream ID: 0x3f3f000000000003
19+
Initial ID: 0x3f3f000000000003
20+
Reply ID: 0x3f3f000000000002
21+
Direction: INI
22+
Sequence: 0
23+
Acknowledge: 0
24+
Maximum: 0
25+
Timestamp: 0x0000000000000000
26+
Trace ID: 0x8000000000000001
27+
Authorization: 0x0000000000000000
28+
Affinity: 0x0000000000000000
29+
Extension: ws
30+
Stream Type ID: 0xe9cd9d56
31+
Stream Type: ws
32+
Protocol:
33+
Length: -1
34+
Protocol:
35+
Scheme: http
36+
Length: 4
37+
Scheme: http
38+
Authority: localhost:8080
39+
Length: 14
40+
Authority: localhost:8080
41+
Path: /echo
42+
Length: 5
43+
Path: /echo
44+
45+
Frame 2: 202 bytes on wire (1616 bits), 202 bytes captured (1616 bits)
46+
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
47+
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
48+
Transmission Control Protocol, Src Port: 7114, Dst Port: 37114, Seq: 1, Ack: 168, Len: 128
49+
Zilla Frame
50+
Frame Type ID: 0x00000001
51+
Frame Type: BEGIN
52+
Protocol Type ID: 0x00000000
53+
Protocol Type:
54+
Worker: 0
55+
Offset: 0x00000080
56+
Origin ID: 0x0000000100000002
57+
Origin Namespace: test
58+
Origin Binding: app0
59+
Routed ID: 0x0000000100000002
60+
Routed Namespace: test
61+
Routed Binding: app0
62+
Stream ID: 0x3f3f000000000002
63+
Initial ID: 0x3f3f000000000003
64+
Reply ID: 0x3f3f000000000002
65+
Direction: REP
66+
Sequence: 0
67+
Acknowledge: 0
68+
Maximum: 0
69+
Timestamp: 0x0000000000000000
70+
Trace ID: 0x8000000000000002
71+
Authorization: 0x0000000000000000
72+
Affinity: 0x0000000000000000
73+
74+
Frame 3: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
75+
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
76+
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
77+
Transmission Control Protocol, Src Port: 37114, Dst Port: 7114, Seq: 168, Ack: 129, Len: 137
78+
Zilla Frame
79+
Frame Type ID: 0x40000002
80+
Frame Type: WINDOW
81+
Protocol Type ID: 0x00000000
82+
Protocol Type:
83+
Worker: 0
84+
Offset: 0x000000d8
85+
Origin ID: 0x0000000100000002
86+
Origin Namespace: test
87+
Origin Binding: app0
88+
Routed ID: 0x0000000100000002
89+
Routed Namespace: test
90+
Routed Binding: app0
91+
Stream ID: 0x3f3f000000000003
92+
Initial ID: 0x3f3f000000000003
93+
Reply ID: 0x3f3f000000000002
94+
Direction: INI
95+
Sequence: 0
96+
Acknowledge: 0
97+
Maximum: 8192
98+
Timestamp: 0x0000000000000000
99+
Trace ID: 0x8000000000000003
100+
Authorization: 0x0000000000000000
101+
Budget ID: 0x0000000000000000
102+
Padding: 0
103+
Minimum: 0
104+
Capabilities: 0x00
105+
Progress: 0
106+
Progress/Maximum: 0/8192
107+
108+
Frame 4: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
109+
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
110+
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
111+
Transmission Control Protocol, Src Port: 7114, Dst Port: 37114, Seq: 129, Ack: 305, Len: 137
112+
Zilla Frame
113+
Frame Type ID: 0x40000002
114+
Frame Type: WINDOW
115+
Protocol Type ID: 0x00000000
116+
Protocol Type:
117+
Worker: 0
118+
Offset: 0x00000138
119+
Origin ID: 0x0000000100000002
120+
Origin Namespace: test
121+
Origin Binding: app0
122+
Routed ID: 0x0000000100000002
123+
Routed Namespace: test
124+
Routed Binding: app0
125+
Stream ID: 0x3f3f000000000002
126+
Initial ID: 0x3f3f000000000003
127+
Reply ID: 0x3f3f000000000002
128+
Direction: REP
129+
Sequence: 0
130+
Acknowledge: 0
131+
Maximum: 8192
132+
Timestamp: 0x0000000000000000
133+
Trace ID: 0x8000000000000004
134+
Authorization: 0x0000000000000000
135+
Budget ID: 0x0000000000000000
136+
Padding: 0
137+
Minimum: 0
138+
Capabilities: 0x00
139+
Progress: 0
140+
Progress/Maximum: 0/8192
141+
142+
Frame 5: 241 bytes on wire (1928 bits), 241 bytes captured (1928 bits)
143+
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
144+
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
145+
Transmission Control Protocol, Src Port: 37114, Dst Port: 7114, Seq: 305, Len: 167
146+
Zilla Frame
147+
Frame Type ID: 0x40000005
148+
Frame Type: REDIRECT
149+
Protocol Type ID: 0x00000000
150+
Protocol Type:
151+
Worker: 0
152+
Offset: 0x00000198
153+
Origin ID: 0x0000000100000002
154+
Origin Namespace: test
155+
Origin Binding: app0
156+
Routed ID: 0x0000000100000002
157+
Routed Namespace: test
158+
Routed Binding: app0
159+
Stream ID: 0x3f3f000000000003
160+
Initial ID: 0x3f3f000000000003
161+
Reply ID: 0x3f3f000000000002
162+
Direction: INI
163+
Sequence: 0
164+
Acknowledge: 0
165+
Maximum: 8192
166+
Timestamp: 0x0000000000000000
167+
Trace ID: 0x8000000000000005
168+
Authorization: 0x0000000000000000
169+
Affinity: 0x00000000000000b1
170+
Extension: ws
171+
Stream Type ID: 0xe9cd9d56
172+
Stream Type: ws
173+
Protocol:
174+
Length: -1
175+
Protocol:
176+
Scheme: http
177+
Length: 4
178+
Scheme: http
179+
Authority: localhost:8080
180+
Length: 14
181+
Authority: localhost:8080
182+
Path: /echo
183+
Length: 5
184+
Path: /echo
185+
186+
Frame 6: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
187+
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
188+
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
189+
Transmission Control Protocol, Src Port: 7114, Dst Port: 37114, Seq: 266, Len: 120
190+
Zilla Frame
191+
Frame Type ID: 0x40000001
192+
Frame Type: RESET
193+
Protocol Type ID: 0x00000000
194+
Protocol Type:
195+
Worker: 0
196+
Offset: 0x00000218
197+
Origin ID: 0x0000000100000002
198+
Origin Namespace: test
199+
Origin Binding: app0
200+
Routed ID: 0x0000000100000002
201+
Routed Namespace: test
202+
Routed Binding: app0
203+
Stream ID: 0x3f3f000000000002
204+
Initial ID: 0x3f3f000000000003
205+
Reply ID: 0x3f3f000000000002
206+
Direction: REP
207+
Sequence: 0
208+
Acknowledge: 0
209+
Maximum: 8192
210+
Timestamp: 0x0000000000000000
211+
Trace ID: 0x8000000000000006
212+
Authorization: 0x0000000000000000
213+

0 commit comments

Comments
 (0)