Skip to content

chore: merge codeql checks to run in parallel #5907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix comments
  • Loading branch information
kylecarbs committed Jan 29, 2023
commit 64993a09de55c7e71d86abece7ed9bb623250e70
4 changes: 3 additions & 1 deletion agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,9 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
if err != nil {
continue
}
_ = a.handleReconnectingPTY(ctx, logger, msg, conn)
go func() {
_ = a.handleReconnectingPTY(ctx, logger, msg, conn)
}()
}
}); err != nil {
return nil, err
Expand Down
2 changes: 0 additions & 2 deletions cli/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,6 @@ fi

test ! -S "$agent_socket"
`)
fmt.Printf("Agent bytes %s\n", agentSocketBytes)

agentSocket := strings.TrimSpace(string(agentSocketBytes))
if err != nil {
return xerrors.Errorf("check if agent socket is running (check if %q exists): %w", agentSocket, err)
Expand Down
5 changes: 4 additions & 1 deletion scaletest/reconnectingpty/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ import (

func Test_Runner(t *testing.T) {
t.Parallel()
t.Skip()
// There's a race condition in agent/agent.go where connections
// aren't closed when the Tailnet connection is. This causes the
// goroutines to hang around and cause the test to fail.
t.Skip("TODO: fix this test")

t.Run("OK", func(t *testing.T) {
t.Parallel()
Expand Down