shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-02 20:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(cli): attempt to fix TestGitSSH flake (#21230)

Browse Source 
Since the failing test logs are gone, we can only guess at what went
wrong. Given our parallel test-suite, and that tests typically run slow
on Windows, it seems reasonable that the context timed out due to a
single context being responsbile for setup and two command executions.

This change fixes the issue by updating the context usage, if this flake
ever resurfaces, we can re-investigate.

Fixes coder/internal#770
This commit is contained in:
Mathias Fredriksson
2025-12-11 20:41:45 +02:00
committed by GitHub
parent 2e4aa729be
commit 3d38cd568e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/gitssh_test.go
+7 -8
View File
@@ -116,10 +116,8 @@ func TestGitSSH(t *testing.T) {
t.Run("Dial", func(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
client, token, pubkey := prepareTestGitSSH(ctx, t)
setupCtx := testutil.Context(t, testutil.WaitLong)
client, token, pubkey := prepareTestGitSSH(setupCtx, t)
var inc int64
errC := make(chan error, 1)
addr := serveSSHForGitSSH(t, func(s ssh.Session) {
@@ -143,6 +141,7 @@ func TestGitSSH(t *testing.T) {
"-o", "IdentitiesOnly=yes",
"127.0.0.1",
)
ctx := testutil.Context(t, testutil.WaitMedium)
err := inv.WithContext(ctx).Run()
require.NoError(t, err)
require.EqualValues(t, 1, inc)
@@ -166,10 +165,8 @@ func TestGitSSH(t *testing.T) {
require.NoError(t, err)
writePrivateKeyToFile(t, idFile, privkey)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
client, token, coderPubkey := prepareTestGitSSH(ctx, t)
setupCtx := testutil.Context(t, testutil.WaitLong)
client, token, coderPubkey := prepareTestGitSSH(setupCtx, t)
authkey := make(chan gossh.PublicKey, 1)
addr := serveSSHForGitSSH(t, func(s ssh.Session) {
@@ -208,6 +205,7 @@ func TestGitSSH(t *testing.T) {
inv, _ := clitest.New(t, cmdArgs...)
inv.Stdout = pty.Output()
inv.Stderr = pty.Output()
ctx := testutil.Context(t, testutil.WaitMedium)
err = inv.WithContext(ctx).Run()
require.NoError(t, err)
select {
@@ -225,6 +223,7 @@ func TestGitSSH(t *testing.T) {
inv, _ = clitest.New(t, cmdArgs...)
inv.Stdout = pty.Output()
inv.Stderr = pty.Output()
ctx = testutil.Context(t, testutil.WaitMedium) // Reset context for second cmd test.
err = inv.WithContext(ctx).Run()
require.NoError(t, err)
select {