diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-23 19:03:21 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-23 19:03:21 +0300 |
| commit | 8597809f5069ef90b776282dcd4c12c3ed0d6348 (patch) | |
| tree | 2de929c5c34ec9d010829938bfceab5826d4da47 | |
| parent | 06352f2e01c579da1e419ad1465642307313b645 (diff) | |
| parent | 1d77cea5f78c20e475b80892e6e13378c8b7b4cd (diff) | |
Merge branch 'ping-test-timeout' into 'master'
Extend startup timeout for rubyserver ping test
See merge request gitlab-org/gitaly!690
| -rw-r--r-- | internal/rubyserver/health_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/rubyserver/health_test.go b/internal/rubyserver/health_test.go index f5a870321..5d513b85d 100644 --- a/internal/rubyserver/health_test.go +++ b/internal/rubyserver/health_test.go @@ -18,7 +18,7 @@ func TestPingSuccess(t *testing.T) { w := s.workers[0] var pingErr error - for start := time.Now(); time.Since(start) < 5*time.Second; time.Sleep(100 * time.Millisecond) { + for start := time.Now(); time.Since(start) < ConnectTimeout; time.Sleep(100 * time.Millisecond) { pingErr = ping(w.address) if pingErr == nil { break |