Commit 8fa8acf036 for openssl.org
commit 8fa8acf0362f55e539bf61a86ddbdcbb57eeb2b6
Author: Alexandr Nedvedicky <sashan@openssl.org>
Date: Mon Apr 20 22:52:19 2026 +0200
test: move 'Simple single-stream test' from quic_multstream to quic-radix
unlike multistream test, which uses t-server, the radix tests
use regular SSL objects, thus radix tests execute production code.
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
MergeDate: Tue Apr 28 12:35:42 2026
(Merged from https://github.com/openssl/openssl/pull/30913)
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index 3bb1bd9a0b..a45a9407a3 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -2042,17 +2042,7 @@ static CRYPTO_THREAD_RETVAL run_script_child_thread(void *arg)
/* 1. Simple single-stream test */
static const struct script_op script_1[] = {
- OP_C_SET_ALPN("ossltest"),
- OP_C_CONNECT_WAIT(),
- OP_C_WRITE(DEFAULT, "apple", 5),
- OP_C_CONCLUDE(DEFAULT),
- OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0)),
- OP_S_READ_EXPECT(a, "apple", 5),
- OP_S_EXPECT_FIN(a),
- OP_S_WRITE(a, "orange", 6),
- OP_S_CONCLUDE(a),
- OP_C_READ_EXPECT(DEFAULT, "orange", 6),
- OP_C_EXPECT_FIN(DEFAULT),
+ /* test moved to test/radix/quic_tests.c */
OP_END
};
diff --git a/test/radix/quic_tests.c b/test/radix/quic_tests.c
index 181ba1226b..5544a9d3db 100644
--- a/test/radix/quic_tests.c
+++ b/test/radix/quic_tests.c
@@ -22,6 +22,23 @@
* ============================================================================
*/
+/*
+ * Simple single-stream test
+ */
+DEF_SCRIPT(simple_stream, "single stream test")
+{
+ OP_SIMPLE_PAIR_CONN();
+ OP_WRITE_B(C, "apple");
+ OP_ACCEPT_CONN_WAIT(L, S, 0);
+ OP_CONCLUDE(C);
+ OP_READ_EXPECT_B(S, "apple");
+ OP_EXPECT_FIN(S);
+ OP_WRITE_B(S, "orange");
+ OP_READ_EXPECT_B(C, "orange");
+ OP_CONCLUDE(S);
+ OP_EXPECT_FIN(C);
+}
+
/*
* Test: simple_conn
* -----------------
@@ -299,8 +316,9 @@ DEF_SCRIPT(check_cwm, "check stream obeys cwm")
* ============================================================================
*/
static SCRIPT_INFO *const scripts[] = {
+ USE(simple_stream),
USE(simple_conn),
USE(simple_thread),
USE(ssl_poll),
- USE(check_cwm)
+ USE(check_cwm),
};