From 15675e28f1e3ba25f3abd099c14a7800c8bae2b8 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 12 Jul 2019 09:51:32 -0700 Subject: [PATCH] Don't log test initial test daemon ping failures This is just noise due to timing. I picked `> 2` just based on logs from tests I've seen there's always 1 or 2. Signed-off-by: Brian Goff --- internal/test/daemon/daemon.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/test/daemon/daemon.go b/internal/test/daemon/daemon.go index d0fed026c6..99cff18f4f 100644 --- a/internal/test/daemon/daemon.go +++ b/internal/test/daemon/daemon.go @@ -311,7 +311,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error { defer cancel() // make sure daemon is ready to receive requests - for { + for i := 0; ; i++ { d.log.Logf("[%s] waiting for daemon to start", d.id) select { @@ -325,9 +325,14 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error { resp, err := client.Do(req.WithContext(rctx)) if err != nil { - d.log.Logf("[%s] error pinging daemon on start: %v", d.id, err) + if i > 2 { // don't log the first couple, this ends up just being noise + d.log.Logf("[%s] error pinging daemon on start: %v", d.id, err) + } - time.Sleep(500 * time.Millisecond) + select { + case <-ctx.Done(): + case <-time.After(500 * time.Microsecond): + } continue }