Skip to content

Commit 54b0a94

Browse files
deansheatherdeansheather
committed
fixup! chore: add more output format tests
1 parent 1ced0ce commit 54b0a94

File tree

3 files changed

+28
-9
lines changed

3 files changed

+28
-9
lines changed

‎cli/list_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@ func TestList(t *testing.T) {
6060
cmd, root := clitest.New(t, "list", "--output=json")
6161
clitest.SetupConfig(t, client, root)
6262

63+
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
64+
defer cancelFunc()
65+
6366
out := bytes.NewBuffer(nil)
6467
cmd.SetOut(out)
65-
err := cmd.Execute()
68+
err := cmd.ExecuteContext(ctx)
6669
require.NoError(t, err)
6770

6871
var templates []codersdk.Workspace

‎cli/templatelist_test.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package cli_test
22

33
import (
44
"bytes"
5+
"context"
56
"encoding/json"
67
"sort"
78
"testing"
@@ -12,6 +13,7 @@ import (
1213
"github.com/coder/coder/coderd/coderdtest"
1314
"github.com/coder/coder/codersdk"
1415
"github.com/coder/coder/pty/ptytest"
16+
"github.com/coder/coder/testutil"
1517
)
1618

1719
func TestTemplateList(t *testing.T) {
@@ -35,9 +37,12 @@ func TestTemplateList(t *testing.T) {
3537
cmd.SetIn(pty.Input())
3638
cmd.SetOut(pty.Output())
3739

40+
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
41+
defer cancelFunc()
42+
3843
errC := make(chan error)
3944
go func() {
40-
errC <- cmd.Execute()
45+
errC <- cmd.ExecuteContext(ctx)
4146
}()
4247

4348
// expect that templates are listed alphabetically
@@ -65,9 +70,12 @@ func TestTemplateList(t *testing.T) {
6570
cmd, root := clitest.New(t, "templates", "list", "--output=json")
6671
clitest.SetupConfig(t, client, root)
6772

73+
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
74+
defer cancelFunc()
75+
6876
out := bytes.NewBuffer(nil)
6977
cmd.SetOut(out)
70-
err := cmd.Execute()
78+
err := cmd.ExecuteContext(ctx)
7179
require.NoError(t, err)
7280

7381
var templates []codersdk.Template
@@ -86,9 +94,12 @@ func TestTemplateList(t *testing.T) {
8694
cmd.SetIn(pty.Input())
8795
cmd.SetErr(pty.Output())
8896

97+
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
98+
defer cancelFunc()
99+
89100
errC := make(chan error)
90101
go func() {
91-
errC <- cmd.Execute()
102+
errC <- cmd.ExecuteContext(ctx)
92103
}()
93104

94105
require.NoError(t, <-errC)

‎cli/tokens_test.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package cli_test
22

33
import (
44
"bytes"
5+
"context"
56
"encoding/json"
67
"regexp"
78
"testing"
@@ -11,19 +12,23 @@ import (
1112
"github.com/coder/coder/cli/clitest"
1213
"github.com/coder/coder/coderd/coderdtest"
1314
"github.com/coder/coder/codersdk"
15+
"github.com/coder/coder/testutil"
1416
)
1517

1618
func TestTokens(t *testing.T) {
1719
t.Parallel()
1820
client := coderdtest.New(t, nil)
1921
_ = coderdtest.CreateFirstUser(t, client)
2022

23+
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
24+
defer cancelFunc()
25+
2126
// helpful empty response
2227
cmd, root := clitest.New(t, "tokens", "ls")
2328
clitest.SetupConfig(t, client, root)
2429
buf := new(bytes.Buffer)
2530
cmd.SetOut(buf)
26-
err := cmd.Execute()
31+
err := cmd.ExecuteContext(ctx)
2732
require.NoError(t, err)
2833
res := buf.String()
2934
require.Contains(t, res, "tokens found")
@@ -32,7 +37,7 @@ func TestTokens(t *testing.T) {
3237
clitest.SetupConfig(t, client, root)
3338
buf = new(bytes.Buffer)
3439
cmd.SetOut(buf)
35-
err = cmd.Execute()
40+
err = cmd.ExecuteContext(ctx)
3641
require.NoError(t, err)
3742
res = buf.String()
3843
require.NotEmpty(t, res)
@@ -46,7 +51,7 @@ func TestTokens(t *testing.T) {
4651
clitest.SetupConfig(t, client, root)
4752
buf = new(bytes.Buffer)
4853
cmd.SetOut(buf)
49-
err = cmd.Execute()
54+
err = cmd.ExecuteContext(ctx)
5055
require.NoError(t, err)
5156
res = buf.String()
5257
require.NotEmpty(t, res)
@@ -60,7 +65,7 @@ func TestTokens(t *testing.T) {
6065
clitest.SetupConfig(t, client, root)
6166
buf = new(bytes.Buffer)
6267
cmd.SetOut(buf)
63-
err = cmd.Execute()
68+
err = cmd.ExecuteContext(ctx)
6469
require.NoError(t, err)
6570

6671
var tokens []codersdk.APIKey
@@ -72,7 +77,7 @@ func TestTokens(t *testing.T) {
7277
clitest.SetupConfig(t, client, root)
7378
buf = new(bytes.Buffer)
7479
cmd.SetOut(buf)
75-
err = cmd.Execute()
80+
err = cmd.ExecuteContext(ctx)
7681
require.NoError(t, err)
7782
res = buf.String()
7883
require.NotEmpty(t, res)

0 commit comments

Comments
 (0)