Merge branch 'master' into add-close-code-to-websocket-and-fixes

2019-04-25 08:39:46 +02:00
parent f9abf3908f d036ad7138
commit 2dfd141897
5 changed files with 20 additions and 9 deletions
--- a/test/IXWebSocketServerTest.cpp
+++ b/test/IXWebSocketServerTest.cpp
@@ -204,9 +204,8 @@ TEST_CASE("Websocket_server", "[websocket_server]")
        // Give us 500ms for the server to notice that clients went away
        ix::msleep(500);

-        REQUIRE(connectionId == "foobarConnectionId");
-
        server.stop();
+        REQUIRE(connectionId == "foobarConnectionId");
        REQUIRE(server.getClients().size() == 0);
    }
 }