From 7257d64a2179621d5514a310472ad28db4922c32 Mon Sep 17 00:00:00 2001 From: Richard Hodges Date: Tue, 30 Mar 2021 12:01:11 +0200 Subject: [PATCH] WebSocket test is deterministic --- CHANGELOG.md | 4 ++++ test/beast/websocket/timer.cpp | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f3f4f6..9dbdd119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +* WebSocket test is deterministic. + +-------------------------------------------------------------------------------- + Version 313: * Fix incorrect websocket test ordering. diff --git a/test/beast/websocket/timer.cpp b/test/beast/websocket/timer.cpp index f3507c1d..2d7b3142 100644 --- a/test/beast/websocket/timer.cpp +++ b/test/beast/websocket/timer.cpp @@ -108,16 +108,17 @@ struct timer_test : unit_test::suite ioc.restart(); flat_buffer b; - error_code ec1, ec2; + error_code ec2; ws1.async_close({}, [&ec2](error_code ec) { ec2 = ec; }); ioc.run(); - BEAST_EXPECT( - ec1 == beast::error::timeout || - ec2 == beast::error::timeout); + BEAST_EXPECTS( + ec2 == beast::error::timeout || + ec2 == net::error::operation_aborted, + ec2.message()); } { net::io_context ioc; @@ -186,8 +187,8 @@ struct timer_test : unit_test::suite void run() override { - testIdlePing(); testIssue1729(); + testIdlePing(); testCloseWhileRead(); } };