Skip to content

cli/image: make history test timezone-independent #7296

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

Open
keeltrace wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −3
Open

cli/image: make history test timezone-independent #7296

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad92ba
cli/image: make history test timezone-independent
keeltrace Sep 9, 2026
d83935a
test: keep timezone rationale with setup
keeltrace Sep 9, 2026
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
11 changes: 8 additions & 3 deletions cli/command/image/history_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ func TestNewHistoryCommandErrors(t *testing.T) {
}

func TestNewHistoryCommandSuccess(t *testing.T) {
// Set to UTC timezone as timestamps in output are
// printed in the current timezone
local := time.Local
time.Local = time.UTC
t.Cleanup(func() {
time.Local = local
})

testCases := []struct {
name string
args []string
Expand Down Expand Up @@ -118,9 +126,6 @@ func TestNewHistoryCommandSuccess(t *testing.T) {
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
// Set to UTC timezone as timestamps in output are
// printed in the current timezone
Comment on lines -121 to -122

@thaJeztah thaJeztah Sep 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Perhaps it's worth keeping the comment (but can be moved to the new code).

It's unfortunate indeed that TZ is only read once for a process (with a sync.Once) so there's no clean way to override it for a test 🤔

t.Setenv("TZ", "UTC")
cli := test.NewFakeCli(&fakeClient{imageHistoryFunc: tc.imageHistoryFunc})
cmd := newHistoryCommand(cli)
cmd.SetOut(io.Discard)
Expand Down
Loading