Repository: mesos Updated Branches: refs/heads/master afd56ea59 -> 08aa92b2a
Revert "Fixed tests to call socket accept before sending response." This reverts commit 2ecd10240d7671dfe6b16118e5ad2e33f8cbc712. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/08aa92b2 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/08aa92b2 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/08aa92b2 Branch: refs/heads/master Commit: 08aa92b2ae36ed42bb3cf392b0f320a34da5af46 Parents: afd56ea Author: Jie Yu <[email protected]> Authored: Thu Dec 10 14:32:10 2015 -0800 Committer: Jie Yu <[email protected]> Committed: Thu Dec 10 14:32:10 2015 -0800 ---------------------------------------------------------------------- .../containerizer/provisioner_docker_tests.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/08aa92b2/src/tests/containerizer/provisioner_docker_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp index 31e7a31..3f1717b 100644 --- a/src/tests/containerizer/provisioner_docker_tests.cpp +++ b/src/tests/containerizer/provisioner_docker_tests.cpp @@ -690,11 +690,10 @@ TEST_F(RegistryClientTest, SimpleGetManifest) // Send 401 Unauthorized response for a manifest request. Future<string> manifestHttpRequest = Socket(socket.get()).recv(); AWAIT_ASSERT_READY(manifestHttpRequest); - - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(unauthHttpResponse)); // Token response. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); Future<string> tokenRequest = Socket(socket.get()).recv(); @@ -710,10 +709,10 @@ TEST_F(RegistryClientTest, SimpleGetManifest) "\r\n" + tokenResponse; - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(tokenHttpResponse)); // Manifest response. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); manifestHttpRequest = Socket(socket.get()).recv(); @@ -869,11 +868,10 @@ TEST_F(RegistryClientTest, SimpleGetBlob) // Send 401 Unauthorized response. Future<string> blobHttpRequest = Socket(socket.get()).recv(); AWAIT_ASSERT_READY(blobHttpRequest); - - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(unauthHttpResponse)); // Send token response. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); Future<string> tokenRequest = Socket(socket.get()).recv(); @@ -889,10 +887,10 @@ TEST_F(RegistryClientTest, SimpleGetBlob) "\r\n" + tokenResponse; - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(tokenHttpResponse)); // Send redirect. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); blobHttpRequest = Socket(socket.get()).recv(); @@ -1039,11 +1037,10 @@ TEST_F(RegistryClientTest, SimpleRegistryPuller) // Send 401 Unauthorized response for a manifest request. Future<string> registryPullerHttpRequestFuture = Socket(socket.get()).recv(); AWAIT_ASSERT_READY(registryPullerHttpRequestFuture); - - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(unauthHttpResponse)); // Token response. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); Future<string> tokenRequestFuture = Socket(socket.get()).recv(); @@ -1059,10 +1056,10 @@ TEST_F(RegistryClientTest, SimpleRegistryPuller) "\r\n" + tokenResponse; - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(tokenHttpResponse)); // Manifest response. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); registryPullerHttpRequestFuture = Socket(socket.get()).recv(); @@ -1122,10 +1119,10 @@ TEST_F(RegistryClientTest, SimpleRegistryPuller) "\r\n" + manifestResponse; - socket = server.get().accept(); AWAIT_ASSERT_READY(Socket(socket.get()).send(manifestHttpResponse)); // Redirect response. + socket = server.get().accept(); AWAIT_ASSERT_READY(socket); registryPullerHttpRequestFuture = Socket(socket.get()).recv();
