e2e: an instance is ready on every listener before a test starts !183
1 file changed, +6 −13
Layout: unified · split
e2e/ssh_test.go +6 −13
| @@ -10,7 +10,6 @@ import ( | |||
| 10 | "path/filepath" | 10 | "path/filepath" |
| 11 | "strings" | 11 | "strings" |
| 12 | "testing" | 12 | "testing" |
| 13 | "time" | ||
| 14 | ) | 13 | ) |
| 15 | 14 | ||
| 16 | type instance struct { | 15 | type instance struct { |
| @@ -113,19 +112,13 @@ port = %d | |||
| 113 | inst.proc.Wait() | 112 | inst.proc.Wait() |
| 114 | }) | 113 | }) |
| 115 | 114 | ||
| 116 | // Wait for the listener. | 115 | // Every listener, not just SSH: the HTTP and git ones come up in their |
| 117 | deadline := time.Now().Add(10 * time.Second) | 116 | // own goroutines, and a test whose first act is an HTTP request used |
| 118 | for { | 117 | // to race them and be refused. |
| 119 | conn, err := net.DialTimeout("tcp", fmt.Sprintf("127.0.0.1:%d", inst.port), 200*time.Millisecond) | 118 | for _, port := range []int{inst.port, inst.httpPort, inst.gitPort} { |
| 120 | if err == nil { | 119 | waitForPort(t, port) |
| 121 | conn.Close() | ||
| 122 | return inst | ||
| 123 | } | ||
| 124 | if time.Now().After(deadline) { | ||
| 125 | t.Fatal("gitbayd did not start listening") | ||
| 126 | } | ||
| 127 | time.Sleep(50 * time.Millisecond) | ||
| 128 | } | 120 | } |
| 121 | return inst | ||
| 129 | } | 122 | } |
| 130 | 123 | ||
| 131 | // admin runs a gitbayd admin command against the instance's database. | 124 | // admin runs a gitbayd admin command against the instance's database. |