summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2023-08-17 18:32:16 +0100
committerTomas Mraz <tomas@openssl.org>2023-08-29 15:33:22 +0200
commita1d2a9d12d269ba551b1d2d3bc825aedad8984c9 (patch)
treed47a715b4bc77c3aa9c93f0b8609ebddaffc7f37 /test
parent413a427c2a7743474f57d5799f42de5357ceace2 (diff)
QUIC MULTISTREAM TEST: Fix connect-or-fail
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21764)
Diffstat (limited to 'test')
-rw-r--r--test/quic_multistream_test.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index ba973ed11e..42221880d1 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -987,12 +987,13 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
connect_started = 1;
ret = SSL_connect(h->c_conn);
- if (!TEST_true((ret == 1 || op->arg1 > 0)
- || (!h->blocking && is_want(h->c_conn, ret))))
- goto out;
+ if (ret != 1) {
+ if (!h->blocking && is_want(h->c_conn, ret))
+ SPIN_AGAIN();
- if (!h->blocking && ret < 0)
- SPIN_AGAIN();
+ if (op->arg1 == 0 && !TEST_int_eq(ret, 1))
+ goto out;
+ }
}
break;