From bfa74148f0ca5aa676366d47b1527a5d9aa4d858 Mon Sep 17 00:00:00 2001 From: "Ciro S. Costa" Date: Wed, 21 Nov 2018 16:43:32 -0500 Subject: [PATCH] ci : don't wait twice for fly login to exit we were setting a timeout and interval in the eventually but the `Wait()` uses the default 1sec timeout Signed-off-by: Topher Bullock --- docker-compose.yml | 2 +- topgun/fly.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ac9340dce31..1b7dc7b0394 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: environment: - CONCOURSE_LOG_LEVEL=debug - CONCOURSE_TSA_HOST=web:2222 - - CONCOURSE_EPHEMERAL=true + - CONCOURSE_EPHEMERAL=${CONCOURSE_EPHEMERAL:-true} # avoid using loopbacks - CONCOURSE_BAGGAGECLAIM_DRIVER=overlay diff --git a/topgun/fly.go b/topgun/fly.go index 6fe4ab1b8b2..eb52403d5e6 100644 --- a/topgun/fly.go +++ b/topgun/fly.go @@ -32,7 +32,7 @@ func (f *Fly) Login(user, password, endpoint string) { "-c", endpoint, "-u", user, "-p", password, - ).Wait() + ) }, 2*time.Minute, 10*time.Second). Should(gexec.Exit(0), "Fly should have been able to log in") }