Skip to content

fix: fix test flake introduced by #9264 #9330

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 5 commits into from
Aug 25, 2023
Merged

fix: fix test flake introduced by #9264 #9330

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8903040
Fix test flake introduced by #9264
spikecurtis Aug 25, 2023
ee0636a
change check to match suffix
spikecurtis Aug 25, 2023
b4d7968
Ignore error logs on uncanceled build
spikecurtis Aug 25, 2023
52db2ce
ignore error logs in Test_Runner/CleanupPendingBuild
spikecurtis Aug 25, 2023
2d3bd03
accept canceled in Test_Runner/CleanupPendingBuild
spikecurtis Aug 25, 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
Prev Previous commit
Next Next commit
ignore error logs in Test_Runner/CleanupPendingBuild 
Signed-off-by: Spike Curtis <spike@coder.com>
  • Loading branch information
@spikecurtis
spikecurtis committed Aug 25, 2023
commit 52db2cee198e8d1d96ec9c9b0e494dea9293b9fb
8 changes: 6 additions & 2 deletions scaletest/createworkspaces/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,12 @@ func Test_Runner(t *testing.T) {
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)
client := coderdtest.New(t, &coderdtest.Options{
IncludeProvisionerDaemon: true,
Logger: &logger,
})
user := coderdtest.CreateFirstUser(t, client)

Expand Down Expand Up @@ -257,8 +261,8 @@ func Test_Runner(t *testing.T) {
continue
}

// And it should be either canceled or canceling
if build.Job.Status == codersdk.ProvisionerJobCanceled || build.Job.Status == codersdk.ProvisionerJobCanceling {
// And it should be either failed (Echo returns an error when job is canceled) or canceling
if build.Job.Status == codersdk.ProvisionerJobFailed || build.Job.Status == codersdk.ProvisionerJobCanceling {
return true
}
}
Expand Down