mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
fix: Test flake in TestWorkspaceStatus (#4333)
This also changes the status to be on the workspace build, since that's where the true value is calculated. This exposed a bug where jobs could never enter the canceled state unless fetched by a provisioner daemon, which was nice to fix! See: https://github.com/coder/coder/actions/runs/3175304200/jobs/5173479506
This commit is contained in:
@@ -550,7 +550,6 @@ export interface Workspace {
|
||||
readonly autostart_schedule?: string
|
||||
readonly ttl_ms?: number
|
||||
readonly last_used_at: string
|
||||
readonly status: WorkspaceStatus
|
||||
}
|
||||
|
||||
// From codersdk/workspaceresources.go
|
||||
@@ -625,6 +624,7 @@ export interface WorkspaceBuild {
|
||||
readonly reason: BuildReason
|
||||
readonly resources: WorkspaceResource[]
|
||||
readonly deadline?: string
|
||||
readonly status: WorkspaceStatus
|
||||
}
|
||||
|
||||
// From codersdk/workspaces.go
|
||||
@@ -736,7 +736,7 @@ export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected"
|
||||
// From codersdk/workspaceapps.go
|
||||
export type WorkspaceAppHealth = "disabled" | "healthy" | "initializing" | "unhealthy"
|
||||
|
||||
// From codersdk/workspaces.go
|
||||
// From codersdk/workspacebuilds.go
|
||||
export type WorkspaceStatus =
|
||||
| "canceled"
|
||||
| "canceling"
|
||||
|
||||
@@ -216,6 +216,7 @@ export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
|
||||
deadline: "2022-05-17T23:39:00.00Z",
|
||||
reason: "initiator",
|
||||
resources: [],
|
||||
status: "running",
|
||||
}
|
||||
|
||||
export const MockFailedWorkspaceBuild = (
|
||||
@@ -237,6 +238,7 @@ export const MockFailedWorkspaceBuild = (
|
||||
deadline: "2022-05-17T23:39:00.00Z",
|
||||
reason: "initiator",
|
||||
resources: [],
|
||||
status: "running",
|
||||
})
|
||||
|
||||
export const MockWorkspaceBuildStop: TypesGen.WorkspaceBuild = {
|
||||
@@ -268,7 +270,6 @@ export const MockWorkspace: TypesGen.Workspace = {
|
||||
ttl_ms: 2 * 60 * 60 * 1000, // 2 hours as milliseconds
|
||||
latest_build: MockWorkspaceBuild,
|
||||
last_used_at: "",
|
||||
status: "running",
|
||||
}
|
||||
|
||||
export const MockStoppedWorkspace: TypesGen.Workspace = {
|
||||
|
||||
Reference in New Issue
Block a user