Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 00a9994

Browse files
committed
Fix resources not reading in TTY
1 parent f397afc commit 00a9994

File tree

1 file changed

+61
-57
lines changed

1 file changed

+61
-57
lines changed

cli/cliui/resources_test.go

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -16,71 +16,75 @@ func TestWorkspaceResources(t *testing.T) {
1616
t.Run("SingleAgentSSH", func(t *testing.T) {
1717
t.Parallel()
1818
ptty := ptytest.New(t)
19-
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
20-
Type: "google_compute_instance",
21-
Name: "dev",
22-
Transition: database.WorkspaceTransitionStart,
23-
Agents: []codersdk.WorkspaceAgent{{
24-
Name: "dev",
25-
Status: codersdk.WorkspaceAgentConnected,
26-
Architecture: "amd64",
27-
OperatingSystem: "linux",
28-
}},
29-
}}, cliui.WorkspaceResourcesOptions{
30-
WorkspaceName: "example",
31-
})
32-
require.NoError(t, err)
19+
go func() {
20+
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
21+
Type: "google_compute_instance",
22+
Name: "dev",
23+
Transition: database.WorkspaceTransitionStart,
24+
Agents: []codersdk.WorkspaceAgent{{
25+
Name: "dev",
26+
Status: codersdk.WorkspaceAgentConnected,
27+
Architecture: "amd64",
28+
OperatingSystem: "linux",
29+
}},
30+
}}, cliui.WorkspaceResourcesOptions{
31+
WorkspaceName: "example",
32+
})
33+
require.NoError(t, err)
34+
}()
3335
ptty.ExpectMatch("coder ssh example")
3436
})
3537

3638
t.Run("MultipleStates", func(t *testing.T) {
3739
t.Parallel()
3840
ptty := ptytest.New(t)
3941
disconnected := database.Now().Add(-4 * time.Second)
40-
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
41-
Address: "disk",
42-
Transition: database.WorkspaceTransitionStart,
43-
Type: "google_compute_disk",
44-
Name: "root",
45-
}, {
46-
Address: "disk",
47-
Transition: database.WorkspaceTransitionStop,
48-
Type: "google_compute_disk",
49-
Name: "root",
50-
}, {
51-
Address: "another",
52-
Transition: database.WorkspaceTransitionStart,
53-
Type: "google_compute_instance",
54-
Name: "dev",
55-
Agents: []codersdk.WorkspaceAgent{{
56-
CreatedAt: database.Now().Add(-10 * time.Second),
57-
Status: codersdk.WorkspaceAgentConnecting,
58-
Name: "dev",
59-
OperatingSystem: "linux",
60-
Architecture: "amd64",
61-
}},
62-
}, {
63-
Transition: database.WorkspaceTransitionStart,
64-
Type: "kubernetes_pod",
65-
Name: "dev",
66-
Agents: []codersdk.WorkspaceAgent{{
67-
Status: codersdk.WorkspaceAgentConnected,
68-
Name: "go",
69-
Architecture: "amd64",
70-
OperatingSystem: "linux",
42+
go func() {
43+
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
44+
Address: "disk",
45+
Transition: database.WorkspaceTransitionStart,
46+
Type: "google_compute_disk",
47+
Name: "root",
7148
}, {
72-
DisconnectedAt: &disconnected,
73-
Status: codersdk.WorkspaceAgentDisconnected,
74-
Name: "postgres",
75-
Architecture: "amd64",
76-
OperatingSystem: "linux",
77-
}},
78-
}}, cliui.WorkspaceResourcesOptions{
79-
WorkspaceName: "dev",
80-
HideAgentState: false,
81-
HideAccess: false,
82-
})
83-
require.NoError(t, err)
49+
Address: "disk",
50+
Transition: database.WorkspaceTransitionStop,
51+
Type: "google_compute_disk",
52+
Name: "root",
53+
}, {
54+
Address: "another",
55+
Transition: database.WorkspaceTransitionStart,
56+
Type: "google_compute_instance",
57+
Name: "dev",
58+
Agents: []codersdk.WorkspaceAgent{{
59+
CreatedAt: database.Now().Add(-10 * time.Second),
60+
Status: codersdk.WorkspaceAgentConnecting,
61+
Name: "dev",
62+
OperatingSystem: "linux",
63+
Architecture: "amd64",
64+
}},
65+
}, {
66+
Transition: database.WorkspaceTransitionStart,
67+
Type: "kubernetes_pod",
68+
Name: "dev",
69+
Agents: []codersdk.WorkspaceAgent{{
70+
Status: codersdk.WorkspaceAgentConnected,
71+
Name: "go",
72+
Architecture: "amd64",
73+
OperatingSystem: "linux",
74+
}, {
75+
DisconnectedAt: &disconnected,
76+
Status: codersdk.WorkspaceAgentDisconnected,
77+
Name: "postgres",
78+
Architecture: "amd64",
79+
OperatingSystem: "linux",
80+
}},
81+
}}, cliui.WorkspaceResourcesOptions{
82+
WorkspaceName: "dev",
83+
HideAgentState: false,
84+
HideAccess: false,
85+
})
86+
require.NoError(t, err)
87+
}()
8488
ptty.ExpectMatch("google_compute_disk.root")
8589
ptty.ExpectMatch("google_compute_instance.dev")
8690
ptty.ExpectMatch("coder ssh dev.postgres")

0 commit comments

Comments
 (0)