Skip to content

Commit 5f65bad

Browse files
FlamefireFlow86
authored andcommitted
Make TestServer_Works on CI more reliable
1 parent 12da8bf commit 5f65bad

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

tests/s25Main/network/main.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,22 @@ BOOST_AUTO_TEST_CASE(TestServer_Works)
3333
return result;
3434
};
3535
BOOST_TEST(!runServer());
36-
BOOST_TEST_REQUIRE(server.listen(1337));
36+
const auto port = server.tryListen();
37+
BOOST_TEST_REQUIRE(port > 0);
3738
BOOST_TEST(runServer());
3839

3940
Socket sock;
40-
BOOST_TEST_REQUIRE(sock.Connect("localhost", 1337, false));
41+
BOOST_TEST_REQUIRE(sock.Connect("localhost", port, false));
4142
BOOST_TEST(server.run(true));
4243
BOOST_TEST_REQUIRE(server.connections.size() == 1u);
4344
BOOST_TEST(server.stop());
4445
BOOST_TEST_REQUIRE(server.connections.empty());
4546

46-
BOOST_TEST_REQUIRE(server.listen(1337));
47+
BOOST_TEST_REQUIRE(server.listen(port));
4748
Socket sock2;
48-
BOOST_TEST_REQUIRE(sock.Connect("localhost", 1337, false));
49+
BOOST_TEST_REQUIRE(sock.Connect("localhost", port, false));
4950
BOOST_TEST(server.run(true));
50-
BOOST_TEST_REQUIRE(sock2.Connect("localhost", 1337, false));
51+
BOOST_TEST_REQUIRE(sock2.Connect("localhost", port, false));
5152
BOOST_TEST(server.run(true));
5253
BOOST_TEST_REQUIRE(server.connections.size() == 2u);
5354
BOOST_TEST(runServer());
@@ -58,7 +59,10 @@ BOOST_AUTO_TEST_CASE(TestServer_Works)
5859
for(int i = 0; i < 5; i++)
5960
{
6061
if(server.connections.size() == 2u)
62+
{
63+
sock.Sleep(50); // LCOV_EXCL_LINE
6164
BOOST_TEST(runServer()); // LCOV_EXCL_LINE
65+
}
6266
}
6367
}
6468
BOOST_TEST(server.connections.size() == 1u);

0 commit comments

Comments
 (0)