@@ -69,7 +69,7 @@ func (f *fakeContainerCLI) ExecAs(ctx context.Context, name, user string, args .
6969type fakeDevcontainerCLI struct {
7070upID string
7171upErr error
72- upErrC chan error // If set, send to return err, close to return upErr.
72+ upErrC chan func () error // If set, send to return err, close to return upErr.
7373execErr error
7474execErrC chan func (cmd string ,args ... string )error // If set, send fn to return err, nil or close to return execErr.
7575readConfig agentcontainers.DevcontainerConfig
@@ -82,9 +82,9 @@ func (f *fakeDevcontainerCLI) Up(ctx context.Context, _, _ string, _ ...agentcon
8282select {
8383case <- ctx .Done ():
8484return "" ,ctx .Err ()
85- case err ,ok := <- f .upErrC :
85+ case fn ,ok := <- f .upErrC :
8686if ok {
87- return f .upID ,err
87+ return f .upID ,fn ()
8888}
8989}
9090}
@@ -613,7 +613,7 @@ func TestAPI(t *testing.T) {
613613nowRecreateErrorTrap := mClock .Trap ().Now ("recreate" ,"errorTimes" )
614614nowRecreateSuccessTrap := mClock .Trap ().Now ("recreate" ,"successTimes" )
615615
616- tt .devcontainerCLI .upErrC = make (chan error )
616+ tt .devcontainerCLI .upErrC = make (chan func () error )
617617
618618// Setup router with the handler under test.
619619r := chi .NewRouter ()
@@ -1665,7 +1665,7 @@ func TestAPI(t *testing.T) {
16651665mClock = quartz .NewMock (t )
16661666fCCLI = & fakeContainerCLI {arch :"<none>" }
16671667fDCCLI = & fakeDevcontainerCLI {
1668- upErrC :make (chan error ,1 ),
1668+ upErrC :make (chan func () error ,1 ),
16691669}
16701670fSAC = & fakeSubAgentClient {
16711671logger :logger .Named ("fakeSubAgentClient" ),
@@ -1717,7 +1717,7 @@ func TestAPI(t *testing.T) {
17171717
17181718// Given: We simulate an error running `devcontainer up`
17191719simulatedError := xerrors .New ("simulated error" )
1720- testutil .RequireSend (ctx ,t ,fDCCLI .upErrC ,simulatedError )
1720+ testutil .RequireSend (ctx ,t ,fDCCLI .upErrC ,func () error { return simulatedError } )
17211721
17221722nowRecreateErrorTrap .MustWait (ctx ).MustRelease (ctx )
17231723nowRecreateErrorTrap .Close ()
@@ -1742,7 +1742,22 @@ func TestAPI(t *testing.T) {
17421742require .Equal (t ,http .StatusAccepted ,rec .Code )
17431743
17441744// Given: We allow `devcontainer up` to succeed.
1745- testutil .RequireSend (ctx ,t ,fDCCLI .upErrC ,nil )
1745+ testutil .RequireSend (ctx ,t ,fDCCLI .upErrC ,func ()error {
1746+ req = httptest .NewRequest (http .MethodGet ,"/" ,nil )
1747+ rec = httptest .NewRecorder ()
1748+ r .ServeHTTP (rec ,req )
1749+ require .Equal (t ,http .StatusOK ,rec .Code )
1750+
1751+ response = codersdk.WorkspaceAgentListContainersResponse {}
1752+ err = json .NewDecoder (rec .Body ).Decode (& response )
1753+ require .NoError (t ,err )
1754+
1755+ // Then: We make sure that the error has been cleared before running up.
1756+ require .Len (t ,response .Devcontainers ,1 )
1757+ require .Equal (t ,"" ,response .Devcontainers [0 ].Error )
1758+
1759+ return nil
1760+ })
17461761
17471762nowRecreateSuccessTrap .MustWait (ctx ).MustRelease (ctx )
17481763nowRecreateSuccessTrap .Close ()
@@ -1756,7 +1771,7 @@ func TestAPI(t *testing.T) {
17561771err = json .NewDecoder (rec .Body ).Decode (& response )
17571772require .NoError (t ,err )
17581773
1759- // Then: We expectthat there will be no errorassociated with the devcontainer .
1774+ // Then: Wealso expect no errorafter running up. .
17601775require .Len (t ,response .Devcontainers ,1 )
17611776require .Equal (t ,"" ,response .Devcontainers [0 ].Error )
17621777})