synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-18 14:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: GitSSH test flake on slow CI runs (#1001)

Browse Source 
There was a 5s timeout on the context, which was occasionally
hit during slow runs. See:

https://github.com/coder/coder/runs/6025622326?check_suite_focus=true

I also removed the AWS authentication, because it added to the test
time for key-generation and such.
This commit is contained in:
Kyle Carberry
2022-04-14 11:38:54 -05:00
committed by GitHub
parent f3f39f3770
commit 7090227d38
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cli/gitssh_test.go
View File

@ -6,9 +6,9 @@ import (
"net" "net"
"sync/atomic" "sync/atomic"
"testing" "testing"
"time"
"github.com/gliderlabs/ssh" "github.com/gliderlabs/ssh"
"github.com/google/uuid"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
gossh "golang.org/x/crypto/ssh" gossh "golang.org/x/crypto/ssh"
@ -24,25 +24,21 @@ import (
func TestGitSSH(t *testing.T) { func TestGitSSH(t *testing.T) {
t.Parallel() t.Parallel()
t.Run("Dial", func(t *testing.T) { t.Run("Dial", func(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) client := coderdtest.New(t, nil)
defer cancel()
instanceID := "instanceidentifier"
certificates, metadataClient := coderdtest.NewAWSInstanceIdentity(t, instanceID)
client := coderdtest.New(t, &coderdtest.Options{
AWSInstanceIdentity: certificates,
})
user := coderdtest.CreateFirstUser(t, client) user := coderdtest.CreateFirstUser(t, client)
// get user public key // get user public key
keypair, err := client.GitSSHKey(ctx, codersdk.Me) keypair, err := client.GitSSHKey(context.Background(), codersdk.Me)
require.NoError(t, err) require.NoError(t, err)
publicKey, _, _, _, err := gossh.ParseAuthorizedKey([]byte(keypair.PublicKey)) publicKey, _, _, _, err := gossh.ParseAuthorizedKey([]byte(keypair.PublicKey))
require.NoError(t, err) require.NoError(t, err)
// setup provisioner // setup provisioner
agentToken := uuid.NewString()
coderdtest.NewProvisionerDaemon(t, client) coderdtest.NewProvisionerDaemon(t, client)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{ version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
Parse: echo.ParseComplete, Parse: echo.ParseComplete,
ProvisionDryRun: echo.ProvisionComplete,
Provision: []*proto.Provision_Response{{ Provision: []*proto.Provision_Response{{
Type: &proto.Provision_Response_Complete{ Type: &proto.Provision_Response_Complete{
Complete: &proto.Provision_Complete{ Complete: &proto.Provision_Complete{
@ -50,8 +46,8 @@ func TestGitSSH(t *testing.T) {
Name: "somename", Name: "somename",
Type: "someinstance", Type: "someinstance",
Agents: []*proto.Agent{{ Agents: []*proto.Agent{{
Auth: &proto.Agent_InstanceId{ Auth: &proto.Agent_Token{
InstanceId: instanceID, Token: agentToken,
}, },
}}, }},
}}, }},
@ -65,23 +61,20 @@ func TestGitSSH(t *testing.T) {
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
// start workspace agent // start workspace agent
cmd, root := clitest.New(t, "agent", "--auth", "aws-instance-identity", "--url", client.URL.String()) cmd, root := clitest.New(t, "agent", "--token", agentToken, "--url", client.URL.String())
agentClient := &*client agentClient := &*client
clitest.SetupConfig(t, agentClient, root) clitest.SetupConfig(t, agentClient, root)
ctx, cancelFunc := context.WithCancel(context.Background()) ctx, cancelFunc := context.WithCancel(context.Background())
defer cancelFunc() defer cancelFunc()
go func() { go func() {
// A linting error occurs for weakly typing the context value here,
// but it seems reasonable for a one-off test.
// nolint
ctx = context.WithValue(ctx, "aws-client", metadataClient)
err := cmd.ExecuteContext(ctx) err := cmd.ExecuteContext(ctx)
require.NoError(t, err) require.NoError(t, err)
}() }()
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID) coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID) resources, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID)
require.NoError(t, err) require.NoError(t, err)
dialer, err := client.DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, nil, nil) dialer, err := client.DialWorkspaceAgent(context.Background(), resources[0].Agents[0].ID, nil, nil)
require.NoError(t, err) require.NoError(t, err)
defer dialer.Close() defer dialer.Close()
_, err = dialer.Ping() _, err = dialer.Ping()
@ -113,7 +106,7 @@ func TestGitSSH(t *testing.T) {
cmd, root = clitest.New(t, "gitssh", "--global-config="+string(cfgDir), "--", fmt.Sprintf("-p%d", addr.Port), "-o", "StrictHostKeyChecking=no", "127.0.0.1") cmd, root = clitest.New(t, "gitssh", "--global-config="+string(cfgDir), "--", fmt.Sprintf("-p%d", addr.Port), "-o", "StrictHostKeyChecking=no", "127.0.0.1")
clitest.SetupConfig(t, agentClient, root) clitest.SetupConfig(t, agentClient, root)
err = cmd.ExecuteContext(ctx) err = cmd.ExecuteContext(context.Background())
require.NoError(t, err) require.NoError(t, err)
require.EqualValues(t, 1, inc) require.EqualValues(t, 1, inc)
}) })