diff options
author | Hugo Landau <hlandau@openssl.org> | 2024-02-06 12:51:53 +0000 |
---|---|---|
committer | Hugo Landau <hlandau@openssl.org> | 2024-02-10 11:37:14 +0000 |
commit | 32a728d4e4722dbd8b419f449544cc68b87ea6f9 (patch) | |
tree | 182d2da452112ed47e611cec130f2dd0e54c6972 | |
parent | 6d7b0e06a24592790a5b75945ab24e941e3c7cec (diff) |
QUIC MULTISTREAM Test: Ensure poll test is robust
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23495)
-rw-r--r-- | test/quic_multistream_test.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c index adb5cdb397..bda30c11d6 100644 --- a/test/quic_multistream_test.c +++ b/test/quic_multistream_test.c @@ -5468,14 +5468,16 @@ ossl_unused static int script_85_poll(struct helper *h, struct helper_local *hl) ++item; /* Non-zero timeout is not supported. */ - result_count = UINT64_MAX; + result_count = SIZE_MAX; + ERR_set_mark(); if (!TEST_false(SSL_poll(items, OSSL_NELEM(items), sizeof(SSL_POLL_ITEM), &nz_timeout, 0, &result_count)) || !TEST_size_t_eq(result_count, 0)) return 0; - result_count = UINT64_MAX; + ERR_pop_to_mark(); + result_count = SIZE_MAX; ret = SSL_poll(items, OSSL_NELEM(items), sizeof(SSL_POLL_ITEM), &timeout, 0, &result_count); @@ -5553,6 +5555,7 @@ static const struct script_op script_85[] = { OP_SET_INJECT_WORD (C_BIDI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM) /* Ensure sync. */ + OP_S_READ_EXPECT (d, "sync", 4) OP_S_WRITE (d, "x", 1) OP_C_READ_EXPECT (d, "x", 1) |