Skip to content

feat(coderd/database/dbtestutil): set default database timezone to non-UTC in unit tests #9672

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 17 commits into from
Sep 15, 2023
Merged

feat(coderd/database/dbtestutil): set default database timezone to non-UTC in unit tests #9672

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
355b16b
feat(coderd/database/dbtestutil): set a random timezone in the db
johnstcn Sep 13, 2023
986db8b
remove check for tz after set
johnstcn Sep 14, 2023
fc3ba52
clitest: fix timestamp regex to match non-UTC timezones
johnstcn Sep 14, 2023
b3c559a
set fixed timezone in some existing unit tests
johnstcn Sep 14, 2023
f57dc9d
fixup! set fixed timezone in some existing unit tests
johnstcn Sep 14, 2023
d3d1274
fix timezone bug in ActivityBumpWorkspace query
johnstcn Sep 14, 2023
9f1f5c6
refactor to separate package, allow specifying tz
johnstcn Sep 14, 2023
7c2ff2f
set db timezone to canada/newfoundland by default
johnstcn Sep 14, 2023
eecfcdb
test activity bump in multiple timezones
johnstcn Sep 14, 2023
d327131
remove unnecessary IN TIME ZONE UTC in activitybump query
johnstcn Sep 14, 2023
7680984
clarify use of multiple timezones in test
johnstcn Sep 14, 2023
d051bbb
remove deprecation and add linter rule
johnstcn Sep 14, 2023
da059dc
fix typo
johnstcn Sep 14, 2023
0d425ba
bump allowed withinDuration for TestWorkpaceActivityBump
johnstcn Sep 14, 2023
d97ff2f
make Test_ActivityBumpWorkspace more flake-resistant
johnstcn Sep 14, 2023
f18c6b5
replace conditional sleep with a slower unconditional sleep that shou…
johnstcn Sep 14, 2023
5a8aa8b
modify logic slightly in TestWorkspaceActivityBump from "deadline mus…
johnstcn Sep 14, 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
modify logic slightly in TestWorkspaceActivityBump from "deadline mus… 
…t equal max_deadline" to actually be "deadline must not exceed max_deadline" as comments suggest
  • Loading branch information
@johnstcn
johnstcn committed Sep 14, 2023
commit 5a8aa8b810d924a699d5ab61533a7c77b99c97ce
22 changes: 12 additions & 10 deletions coderd/activitybump_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,21 +136,29 @@ func TestWorkspaceActivityBump(t *testing.T) {
return
}

var updatedAfter time.Time
// The Deadline bump occurs asynchronously.
require.Eventuallyf(t,
func() bool {
workspace, err = client.Workspace(ctx, workspace.ID)
require.NoError(t, err)
return workspace.LatestBuild.Deadline.Time != firstDeadline
updatedAfter = dbtime.Now()
if workspace.LatestBuild.Deadline.Time == firstDeadline {
updatedAfter = time.Now()
return false
}
return true
},
testutil.WaitLong, testutil.IntervalFast,
"deadline %v never updated", firstDeadline,
)

require.Greater(t, workspace.LatestBuild.Deadline.Time, updatedAfter)

// If the workspace has a max deadline, the deadline must not exceed
// it.
if maxTTL != 0 && dbtime.Now().Add(ttl).After(workspace.LatestBuild.MaxDeadline.Time) {
require.Equal(t, workspace.LatestBuild.Deadline.Time, workspace.LatestBuild.MaxDeadline.Time)
if workspace.LatestBuild.MaxDeadline.Valid {
require.LessOrEqual(t, workspace.LatestBuild.Deadline.Time, workspace.LatestBuild.MaxDeadline.Time)
return
}
require.WithinDuration(t, dbtime.Now().Add(ttl), workspace.LatestBuild.Deadline.Time, testutil.WaitShort)
Expand Down Expand Up @@ -212,12 +220,6 @@ func TestWorkspaceActivityBump(t *testing.T) {
require.NoError(t, err)
_ = sshConn.Close()

assertBumped(true)

// Double check that the workspace build's deadline is equal to the
// max deadline.
workspace, err = client.Workspace(ctx, workspace.ID)
require.NoError(t, err)
require.Equal(t, workspace.LatestBuild.Deadline.Time, workspace.LatestBuild.MaxDeadline.Time)
assertBumped(true) // also asserts max ttl not exceeded
})
}