From a30d30e379b6b0c32ba3eab1969cf125da2529fc Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sun, 15 Oct 2017 08:47:40 -0700
Subject: [PATCH] Fix spurious race in websocket close test

---
 CHANGELOG.md                   | 1 +
 test/beast/websocket/close.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd696826..304b0b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 123:
 
 * Use unit-test subtree
+* Fix spurious race in websocket close test
 
 --------------------------------------------------------------------------------
 
diff --git a/test/beast/websocket/close.cpp b/test/beast/websocket/close.cpp
index e51ff4cd..494ca42e 100644
--- a/test/beast/websocket/close.cpp
+++ b/test/beast/websocket/close.cpp
@@ -520,6 +520,9 @@ public:
                     if(! ec)
                         BEAST_EXPECT(to_string(b.data()) == s);
                     ++count;
+                    if(count == 4)
+                        BEAST_EXPECT(
+                            ec == boost::asio::error::operation_aborted);
                 });
             ws.async_write(buffer(s),
                 [&](error_code ec, std::size_t n)
@@ -547,7 +550,8 @@ public:
                     if(ec)
                         BOOST_THROW_EXCEPTION(
                             system_error{ec});
-                    BEAST_EXPECT(++count == 2);
+                    ++count;
+                    BEAST_EXPECT(count == 2 || count == 3);
                 });
             BEAST_EXPECT(count == 0);
             ios.run();