Skip to content

test(agent): improve TestAgent_Session_TTY_MOTD_Update #10385

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.

Sign up for GitHub

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 3 commits into from
Oct 23, 2023
Merged

test(agent): improve TestAgent_Session_TTY_MOTD_Update #10385

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f93d9a1
test(agent): improve TestAgent_Session_TTY_MOTD_Update
mafredri Oct 23, 2023
61eb4db
fix lint
mafredri Oct 23, 2023
c152447
Merge branch 'main' into mafredri/test-agent-improve-tty-motd-update
mafredri Oct 23, 2023
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
Next Next commit
test(agent): improve TestAgent_Session_TTY_MOTD_Update
  • Loading branch information
@mafredri
mafredri committed Oct 23, 2023
commit f93d9a10c1a95e5713035cffcebb1044010bab1d
53 changes: 29 additions & 24 deletions agent/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,33 +434,38 @@ func TestAgent_Session_TTY_MOTD_Update(t *testing.T) {
}
//nolint:dogsled // Allow the blank identifiers.
conn, client, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, setSBInterval)
for _, test := range tests {

sshClient, err := conn.SSHClient(ctx)
require.NoError(t, err)
t.Cleanup(func() {
_ = sshClient.Close()
})

//nolint:paralleltest // These tests need to swap the banner func.
for i, test := range tests {
test := test
// Set new banner func and wait for the agent to call it to update the
// banner.
ready := make(chan struct{}, 2)
client.SetServiceBannerFunc(func() (codersdk.ServiceBannerConfig, error) {
select {
case ready <- struct{}{}:
default:
}
return test.banner, nil
})
<-ready
<-ready // Wait for two updates to ensure the value has propagated.
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
// Set new banner func and wait for the agent to call it to update the
// banner.
ready := make(chan struct{}, 2)
client.SetServiceBannerFunc(func() (codersdk.ServiceBannerConfig, error) {
select {
case ready <- struct{}{}:
default:
}
return test.banner, nil
})
<-ready
<-ready // Wait for two updates to ensure the value has propagated.

sshClient, err := conn.SSHClient(ctx)
require.NoError(t, err)
t.Cleanup(func() {
_ = sshClient.Close()
})
session, err := sshClient.NewSession()
require.NoError(t, err)
t.Cleanup(func() {
_ = session.Close()
})
session, err := sshClient.NewSession()
require.NoError(t, err)
t.Cleanup(func() {
_ = session.Close()
})

testSessionOutput(t, session, test.expected, test.unexpected, nil)
testSessionOutput(t, session, test.expected, test.unexpected, nil)
})
}
}

Expand Down