test: fix a bug in stopWs

utam0k · roboquat · commit 403a8e226226 · 2022-09-14T11:12:15.000+02:00
diff --git a/test/pkg/integration/workspace.go b/test/pkg/integration/workspace.go
@@ -321,9 +321,10 @@ func stopWsF(t *testing.T, instanceID string, api *ComponentAPI) stopWorkspaceFu
 			return dr.Status, err
 		}
 
+		var lastStatus *wsmanapi.WorkspaceStatus
 		for {
 			t.Logf("waiting for stopping the workspace: %s", instanceID)
-			lastStatus, err := WaitForWorkspaceStop(sctx, api, instanceID)
+			lastStatus, err = WaitForWorkspaceStop(sctx, api, instanceID)
 			if st, ok := status.FromError(err); ok && st.Code() == codes.Unavailable {
 				api.ClearWorkspaceManagerClientCache()
 				t.Logf("got %v during waiting for stopping the workspace", st)
@@ -334,7 +335,7 @@ func stopWsF(t *testing.T, instanceID string, api *ComponentAPI) stopWorkspaceFu
 			}
 			break
 		}
-		return nil, err
+		return lastStatus, err
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -321,9 +321,10 @@ func stopWsF(t testing.T, instanceID string, api ComponentAPI) stopWorkspaceFu`
`321`	`321`	`return dr.Status, err`
`322`	`322`	`}`
`323`	`323`
	`324`	`+ var lastStatus *wsmanapi.WorkspaceStatus`
`324`	`325`	`for {`
`325`	`326`	`t.Logf("waiting for stopping the workspace: %s", instanceID)`
`326`		`- lastStatus, err := WaitForWorkspaceStop(sctx, api, instanceID)`
	`327`	`+ lastStatus, err = WaitForWorkspaceStop(sctx, api, instanceID)`
`327`	`328`	`if st, ok := status.FromError(err); ok && st.Code() == codes.Unavailable {`
`328`	`329`	`api.ClearWorkspaceManagerClientCache()`
`329`	`330`	`t.Logf("got %v during waiting for stopping the workspace", st)`
`@@ -334,7 +335,7 @@ func stopWsF(t testing.T, instanceID string, api ComponentAPI) stopWorkspaceFu`
`334`	`335`	`}`
`335`	`336`	`break`
`336`	`337`	`}`
`337`		`- return nil, err`
	`338`	`+ return lastStatus, err`
`338`	`339`	`}`
`339`	`340`	`}`
`340`	`341`