From d59fd1282415b03a4ce0f4a9065a6978da83c407 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 9 Oct 2016 14:05:07 +0200 Subject: [PATCH] UnitTests: Try to fix AcceptClient error Former-commit-id: 2545ccc482b0726c23b85e12a3aaa294837676c1 [formerly eda50f108c9d8a4991b59346f47be1850b690f26] [formerly 8b467d645f61cc8b2fcb20318f5c8d792d3fe247 [formerly 287e1abaacb666890183535fc62fa33499f96e83]] Former-commit-id: 40325f685aa612016580d887e8fec111a0845594 [formerly 37695b3f6793e947d79c37b023b9f388b6d888d3] Former-commit-id: 7c6a7d60223733a253d05b52592146ddb51705b8 --- examples/bin/resources/skybox-space.png.REMOVED.git-id | 1 - tests/Engine/Network/TCP.cpp | 9 +++++---- tests/resources/Engine/Audio/Cat.flac.REMOVED.git-id | 1 - .../Engine/Audio/The_Brabanconne.ogg.REMOVED.git-id | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 examples/bin/resources/skybox-space.png.REMOVED.git-id delete mode 100644 tests/resources/Engine/Audio/Cat.flac.REMOVED.git-id delete mode 100644 tests/resources/Engine/Audio/The_Brabanconne.ogg.REMOVED.git-id diff --git a/examples/bin/resources/skybox-space.png.REMOVED.git-id b/examples/bin/resources/skybox-space.png.REMOVED.git-id deleted file mode 100644 index 4bbe2de56..000000000 --- a/examples/bin/resources/skybox-space.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -ca02549e21a494540751b65126dcee5fddfb84db \ No newline at end of file diff --git a/tests/Engine/Network/TCP.cpp b/tests/Engine/Network/TCP.cpp index 4a61e0197..788478c0e 100644 --- a/tests/Engine/Network/TCP.cpp +++ b/tests/Engine/Network/TCP.cpp @@ -1,10 +1,9 @@ +#include +#include +#include #include #include #include - -#include -#include - #include SCENARIO("TCP", "[NETWORK][TCP]") @@ -29,6 +28,8 @@ SCENARIO("TCP", "[NETWORK][TCP]") Nz::IpAddress clientIP = client.GetRemoteAddress(); REQUIRE(clientIP.IsValid()); + Nz::Thread::Sleep(100); + Nz::TcpClient serverToClient; REQUIRE(server.AcceptClient(&serverToClient)); diff --git a/tests/resources/Engine/Audio/Cat.flac.REMOVED.git-id b/tests/resources/Engine/Audio/Cat.flac.REMOVED.git-id deleted file mode 100644 index a686bc57d..000000000 --- a/tests/resources/Engine/Audio/Cat.flac.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -6993cbcca9ac596667135cb0f30bea4841178d3b \ No newline at end of file diff --git a/tests/resources/Engine/Audio/The_Brabanconne.ogg.REMOVED.git-id b/tests/resources/Engine/Audio/The_Brabanconne.ogg.REMOVED.git-id deleted file mode 100644 index bfd8dbd70..000000000 --- a/tests/resources/Engine/Audio/The_Brabanconne.ogg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -94b2c47c9143adbac0fb7e81df5cc87f969f7150 \ No newline at end of file