Skip to content

Commit 4fd7e1b

Browse files
committed
chore: increase test timeout, use context when expecting pty match
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent 16690d2 commit 4fd7e1b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

cli/exp_rpty_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestExpRpty(t *testing.T) {
6464
assert.NoError(t, err)
6565
})
6666

67-
pty.ExpectMatch(randStr)
67+
pty.ExpectMatchContext(ctx, randStr)
6868
<-cmdDone
6969
})
7070

@@ -90,7 +90,7 @@ func TestExpRpty(t *testing.T) {
9090
wantLabel := "coder.devcontainers.TestExpRpty.Container"
9191

9292
client, workspace, agentToken := setupWorkspaceForAgent(t)
93-
ctx := testutil.Context(t, testutil.WaitLong)
93+
ctx := testutil.Context(t, testutil.WaitSuperLong)
9494
pool, err := dockertest.NewPool("")
9595
require.NoError(t, err, "Could not connect to docker")
9696
ct, err := pool.RunWithOptions(&dockertest.RunOptions{
@@ -133,9 +133,9 @@ func TestExpRpty(t *testing.T) {
133133
assert.NoError(t, err)
134134
})
135135

136-
pty.ExpectMatch(" #")
136+
pty.ExpectMatchContext(ctx, " #")
137137
pty.WriteLine("hostname")
138-
pty.ExpectMatch(ct.Container.Config.Hostname)
138+
pty.ExpectMatchContext(ctx, ct.Container.Config.Hostname)
139139
pty.WriteLine("exit")
140140
<-cmdDone
141141
})

cli/ssh_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2058,7 +2058,7 @@ func TestSSH_Container(t *testing.T) {
20582058
ct, err := pool.RunWithOptions(&dockertest.RunOptions{
20592059
Repository: "busybox",
20602060
Tag: "latest",
2061-
Cmd: []string{"sleep", "infnity"},
2061+
Cmd: []string{"sleep", "infinity"},
20622062
}, func(config *docker.HostConfig) {
20632063
config.AutoRemove = true
20642064
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
@@ -2092,9 +2092,9 @@ func TestSSH_Container(t *testing.T) {
20922092
assert.NoError(t, err)
20932093
})
20942094

2095-
ptty.ExpectMatch(" #")
2095+
ptty.ExpectMatchContext(ctx, " #")
20962096
ptty.WriteLine("hostname")
2097-
ptty.ExpectMatch(ct.Container.Config.Hostname)
2097+
ptty.ExpectMatchContext(ctx, ct.Container.Config.Hostname)
20982098
ptty.WriteLine("exit")
20992099
<-cmdDone
21002100
})

0 commit comments

Comments
 (0)