Skip to content

chore: Use contexts with timeout in coderd tests #3381

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 15 commits into from
Aug 9, 2022
Merged

chore: Use contexts with timeout in coderd tests #3381

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c352a07
chore: Use contexts with timeout in `coderd` tests
mafredri Aug 4, 2022
4f7e32e
fix: Speed up TestPaginatedUsers by creating users concurrently
mafredri Aug 4, 2022
ae17114
fix: Bump timeout even more, add individual timeout for assert
mafredri Aug 4, 2022
d76d9ca
chore: Convert into table based test with subtests
mafredri Aug 4, 2022
421e52d
chore: Add nolint
mafredri Aug 4, 2022
0a7642c
chore: Speed up TestPaginatedTemplateVersions via errgroup
mafredri Aug 4, 2022
e3ad325
chore: Manually check template version to control timeout
mafredri Aug 4, 2022
8f5213d
fix: Use testutil constants
mafredri Aug 4, 2022
3774fb1
fix: Whoops
mafredri Aug 4, 2022
98b89ba
chore: Increase assert pagination timeout
mafredri Aug 4, 2022
52d480c
Merge branch 'main' into mafredri/coderd-test-timeouts
mafredri Aug 4, 2022
0ac5fac
Merge branch 'main' into mafredri/coderd-test-timeouts
mafredri Aug 5, 2022
1b99e0b
Merge branch 'main' into mafredri/coderd-test-timeouts
mafredri Aug 5, 2022
b7600aa
Merge branch 'main' into mafredri/coderd-test-timeouts
mafredri Aug 9, 2022
f770c21
Update coderd/templateversions_test.go
mafredri Aug 9, 2022
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
chore: Speed up TestPaginatedTemplateVersions via errgroup
  • Loading branch information
@mafredri
mafredri committed Aug 4, 2022
commit 0a7642cb974ee8ba42014facbf721e64ef547d1c
45 changes: 33 additions & 12 deletions coderd/templateversions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"

"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/codersdk"
Expand Down Expand Up @@ -815,25 +816,45 @@ func TestPaginatedTemplateVersions(t *testing.T) {
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
// This test takes longer than a long time.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It apparently takes even longer than that!

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong*2)
defer cancel()

// Populate database with template versions.
total := 9
eg, egCtx := errgroup.WithContext(ctx)
templateVersionIDs := make([]uuid.UUID, total)
for i := 0; i < total; i++ {
data, err := echo.Tar(nil)
require.NoError(t, err)
file, err := client.Upload(ctx, codersdk.ContentTypeTar, data)
require.NoError(t, err)
templateVersion, err := client.CreateTemplateVersion(ctx, user.OrganizationID, codersdk.CreateTemplateVersionRequest{
TemplateID: template.ID,
StorageSource: file.Hash,
StorageMethod: codersdk.ProvisionerStorageMethodFile,
Provisioner: codersdk.ProvisionerTypeEcho,
i := i
eg.Go(func() error {
data, err := echo.Tar(nil)
if err != nil {
return err
}
file, err := client.Upload(egCtx, codersdk.ContentTypeTar, data)
if err != nil {
return err
}
templateVersion, err := client.CreateTemplateVersion(egCtx, user.OrganizationID, codersdk.CreateTemplateVersionRequest{
TemplateID: template.ID,
StorageSource: file.Hash,
StorageMethod: codersdk.ProvisionerStorageMethodFile,
Provisioner: codersdk.ProvisionerTypeEcho,
})
if err != nil {
return err
}

templateVersionIDs[i] = templateVersion.ID

return nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the sort of thing where it would be really useful to have a mock database and just return some predefined fixture.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very much agreed!

})
require.NoError(t, err)
}
err := eg.Wait()
require.NoError(t, err)

_ = coderdtest.AwaitTemplateVersionJob(t, client, templateVersion.ID)
for _, id := range templateVersionIDs {
_ = coderdtest.AwaitTemplateVersionJob(t, client, id)
}

templateVersions, err := client.TemplateVersionsByTemplate(ctx,
Expand Down