@@ -155,17 +155,19 @@ func TestSSH(t *testing.T) {
155155isFirstBuild := true
156156buildURL := regexp .MustCompile ("/api/v2/workspaces/.*/builds" )
157157buildSync := make (chan struct {})
158+ buildDone := make (chan struct {})
158159buildResume := make (chan struct {})
159160buildSyncMW := func (next http.Handler ) http.Handler {
160161return http .HandlerFunc (func (w http.ResponseWriter ,r * http.Request ) {
161162if r .Method == http .MethodPost && buildURL .MatchString (r .URL .Path ) {
162163if ! isFirstBuild {
164+ t .Log ("buildSyncMW: blocking post-build" )
165+ <- buildSync
163166defer func () {
164- t .Log ("buildSyncMW: blocking post-build" )
165- buildSync <- struct {}{}
167+ buildDone <- struct {}{}
166168<- buildResume
167- t .Log ("buildSyncMW: resuming..." )
168169}()
170+ t .Log ("buildSyncMW: resuming..." )
169171}else {
170172isFirstBuild = false
171173}
@@ -213,9 +215,19 @@ func TestSSH(t *testing.T) {
213215for _ ,pty := range ptys {
214216pty .ExpectMatchContext (ctx ,"Workspace was stopped, starting workspace to allow connecting to" )
215217}
216- for range ptys {
217- testutil .RequireRecvCtx (ctx ,t ,buildSync )
218+
219+ // Allow one build to complete.
220+ testutil .RequireSendCtx (ctx ,t ,buildSync ,struct {}{})
221+ testutil .RequireRecvCtx (ctx ,t ,buildDone )
222+
223+ // Allow the remaining builds to continue.
224+ for i := 0 ;i < len (ptys )- 1 ;i ++ {
225+ testutil .RequireSendCtx (ctx ,t ,buildSync ,struct {}{})
226+ }
227+ for i := 0 ;i < len (ptys )- 1 ;i ++ {
228+ testutil .RequireRecvCtx (ctx ,t ,buildDone )
218229}
230+ // Allow all three endpoints to return.
219231close (buildResume )
220232
221233var foundConflict int