From f4a8559f13c366f3e5440f090cf14795993a1639 Mon Sep 17 00:00:00 2001 From: Stanislau Hlebik Date: Mon, 12 Mar 2018 08:15:21 -0700 Subject: [PATCH] mononoke: fix flakiness of test-eden-server.t Summary: It was flaky because server may not yet be ready to accept connections when we send first request. Sometimes delay needs to be > 1 sec. Let's query eden server in a loop until it responds. Reviewed By: farnz Differential Revision: D7233069 fbshipit-source-id: 8bcb5b2b8ebdc52d2447b33e18580e50c1e27031 --- tests/integration/test-eden-server.t | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/integration/test-eden-server.t b/tests/integration/test-eden-server.t index 7459aee29d..3072cfe82f 100644 --- a/tests/integration/test-eden-server.t +++ b/tests/integration/test-eden-server.t @@ -135,11 +135,16 @@ Heads output order is unpredictable, let's sort them by commit hash I* compaction finished (glob) $ edenserver --config-file $TESTTMP/config -Temporary hack to make sure server is ready - $ sleep 1 - Curl and debugdata output should match $ alias curl="curl --cert $TESTDIR/edenservertest.crt --key $TESTDIR/edenservertest.key --cacert $TESTDIR/edenservertest.crt" + +Wait at most 4 secs until server is ready + $ for i in `seq 1 40`; do + > curl https://localhost:$SOCKET > /dev/null 2>&1 && break + > sleep 0.1 + > done + +Send requests to the server $ curl https://localhost:$SOCKET/repo/cs/3903775176ed42b1458a6281db4a0ccf4d9f287a/roottreemanifestid 2> /dev/null 8515d4bfda768e04af4c13a69a72e28c7effbea7 (no-eol) $ cd repo