kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move UTC selection to testsuite environment variable

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-09-20 18:05:49 -06:00
parent 883de9c4fc
commit 8d4cb37b24
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -82,13 +82,13 @@ vet: $(config)
.PHONY: test .PHONY: test
test: $(config) test: $(config)
go test ./... TZ=UTC go test ./...
.PHONY: test-cover .PHONY: test-cover
test-cover: $(config) test-cover: $(config)
rm -rf coverage rm -rf coverage
mkdir coverage mkdir coverage
go list -f '{{if gt (len .TestGoFiles) 0}}"go test -covermode count -coverprofile {{.Name}}.coverprofile -coverpkg ./... {{.ImportPath}}"{{end}}' ./... | xargs -I {} bash -c {} go list -f '{{if gt (len .TestGoFiles) 0}}"TZ=UTC go test -covermode count -coverprofile {{.Name}}.coverprofile -coverpkg ./... {{.ImportPath}}"{{end}}' ./... | xargs -I {} bash -c {}
echo "mode: count" >coverage/cover.out echo "mode: count" >coverage/cover.out
grep -h -v "^mode:" *.coverprofile >>"coverage/cover.out" grep -h -v "^mode:" *.coverprofile >>"coverage/cover.out"
rm *.coverprofile rm *.coverprofile

4
internal/app/wwctl/container/list/main.go
View File

@@ -27,10 +27,6 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err
for i := 0; i < len(containerInfo); i++ { for i := 0; i < len(containerInfo); i++ {
createTime := time.Unix(int64(containerInfo[i].CreateDate), 0) createTime := time.Unix(int64(containerInfo[i].CreateDate), 0)
modTime := time.Unix(int64(containerInfo[i].ModDate), 0) modTime := time.Unix(int64(containerInfo[i].ModDate), 0)
if vars.utc {
createTime = createTime.UTC()
modTime = modTime.UTC()
}
sz := util.ByteToString(int64(containerInfo[i].ImgSize)) sz := util.ByteToString(int64(containerInfo[i].ImgSize))
if vars.compressed { if vars.compressed {
sz = util.ByteToString(int64(containerInfo[i].ImgSizeComp)) sz = util.ByteToString(int64(containerInfo[i].ImgSizeComp))

2
internal/app/wwctl/container/list/main_test.go
View File

@@ -27,7 +27,7 @@ func Test_List_Args(t *testing.T) {
`, `,
fail: false, fail: false,
}, },
{args: []string{"-ul"}, {args: []string{"-l"},
output: ` CONTAINER NAME NODES KERNEL VERSION CREATION TIME MODIFICATION TIME SIZE output: ` CONTAINER NAME NODES KERNEL VERSION CREATION TIME MODIFICATION TIME SIZE
test 0 02 Jan 00 03:04 UTC 01 Jan 70 00:00 UTC 0 B test 0 02 Jan 00 03:04 UTC 01 Jan 70 00:00 UTC 0 B
`, `,

2
internal/app/wwctl/container/list/root.go
View File

@@ -10,7 +10,6 @@ type variables struct {
kernel bool kernel bool
chroot bool chroot bool
compressed bool compressed bool
utc bool
} }
// GetRootCommand returns the root cobra.Command for the application. // GetRootCommand returns the root cobra.Command for the application.
@@ -29,6 +28,5 @@ func GetCommand() *cobra.Command {
baseCmd.PersistentFlags().BoolVarP(&vars.size, "size", "s", false, "show size information") baseCmd.PersistentFlags().BoolVarP(&vars.size, "size", "s", false, "show size information")
baseCmd.PersistentFlags().BoolVarP(&vars.chroot, "chroot", "c", false, "show size of chroot") baseCmd.PersistentFlags().BoolVarP(&vars.chroot, "chroot", "c", false, "show size of chroot")
baseCmd.PersistentFlags().BoolVar(&vars.compressed, "compressed", false, "show size of the compressed image") baseCmd.PersistentFlags().BoolVar(&vars.compressed, "compressed", false, "show size of the compressed image")
baseCmd.PersistentFlags().BoolVarP(&vars.utc, "utc", "u", false, "use UTC for time output")
return baseCmd return baseCmd
} }