shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-03 04:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(scaletest/createworkspaces): fix ctx init in multiple tests (#16177)

Browse Source
This commit is contained in:
Mathias Fredriksson
2025-01-17 16:43:22 +02:00
committed by GitHub
parent f32f7c6862
commit ea8cd55404
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scaletest/createworkspaces/run_test.go
+9 -12
View File
@@ -52,9 +52,6 @@ func Test_Runner(t *testing.T) {
t.Run("OK", func(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
client := coderdtest.New(t, &coderdtest.Options{
IncludeProvisionerDaemon: true,
})
@@ -109,6 +106,8 @@ func Test_Runner(t *testing.T) {
version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
ctx := testutil.Context(t, testutil.WaitLong)
closerCh := goEventuallyStartFakeAgent(ctx, t, client, authToken)
const (
@@ -199,9 +198,6 @@ func Test_Runner(t *testing.T) {
t.Run("CleanupPendingBuild", func(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
// need to include our own logger because the provisioner (rightly) drops error logs when we shut down the
// test with a build in progress.
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
@@ -253,7 +249,9 @@ func Test_Runner(t *testing.T) {
},
})
ctx := testutil.Context(t, testutil.WaitLong)
cancelCtx, cancelFunc := context.WithCancel(ctx)
done := make(chan struct{})
logs := bytes.NewBuffer(nil)
go func() {
@@ -287,6 +285,8 @@ func Test_Runner(t *testing.T) {
cancelFunc()
<-done
ctx = testutil.Context(t, testutil.WaitLong) // Reset ctx to avoid timeouts.
// When we run the cleanup, it should be canceled
cleanupLogs := bytes.NewBuffer(nil)
cancelCtx, cancelFunc = context.WithCancel(ctx)
@@ -340,9 +340,6 @@ func Test_Runner(t *testing.T) {
t.Run("NoCleanup", func(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
client := coderdtest.New(t, &coderdtest.Options{
IncludeProvisionerDaemon: true,
})
@@ -397,6 +394,7 @@ func Test_Runner(t *testing.T) {
version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
ctx := testutil.Context(t, testutil.WaitLong)
closeCh := goEventuallyStartFakeAgent(ctx, t, client, authToken)
const (
@@ -484,9 +482,6 @@ func Test_Runner(t *testing.T) {
t.Run("FailedBuild", func(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})
client := coderdtest.New(t, &coderdtest.Options{
IncludeProvisionerDaemon: true,
@@ -534,6 +529,8 @@ func Test_Runner(t *testing.T) {
},
})
ctx := testutil.Context(t, testutil.WaitLong)
logs := bytes.NewBuffer(nil)
err := runner.Run(ctx, "1", logs)
logsStr := logs.String()