From 0042edf994d43a0620509101be263f9fa79eb7e3 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 1 Feb 2023 10:56:51 +0100 Subject: [PATCH 1/2] correct behavior of profile add to yes flag --- internal/app/wwctl/profile/add/main.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/app/wwctl/profile/add/main.go b/internal/app/wwctl/profile/add/main.go index 0260f232..81a2f016 100644 --- a/internal/app/wwctl/profile/add/main.go +++ b/internal/app/wwctl/profile/add/main.go @@ -38,10 +38,6 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { if !SetYes { // The checks run twice in the prompt case. // Avoiding putting in a blocking prompt in an API. - err = apiprofile.AddProfile(&set, false) - if err != nil { - return - } _, _, err = apiprofile.ProfileSetParameterCheck(&set, false) if err != nil { return @@ -52,5 +48,5 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { return } } - return apiprofile.ProfileSet(&set) + return apiprofile.AddProfile(&set, false) } From db048bfa732f5abd99b322dc590dbd87b615cb9f Mon Sep 17 00:00:00 2001 From: jason yang Date: Wed, 12 Apr 2023 06:26:51 +0000 Subject: [PATCH 2/2] update the main_test to ignore time zone Signed-off-by: jason yang --- internal/app/wwctl/container/list/main_test.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/internal/app/wwctl/container/list/main_test.go b/internal/app/wwctl/container/list/main_test.go index fadfab81..8a6b4b1d 100644 --- a/internal/app/wwctl/container/list/main_test.go +++ b/internal/app/wwctl/container/list/main_test.go @@ -24,11 +24,9 @@ func Test_List(t *testing.T) { mockFunc func() }{ { - name: "profile list test", - args: []string{}, - stdout: `CONTAINERNAMENODESKERNELVERSIONCREATIONTIMEMODIFICATIONTIMESIZE -test1kernel01Jan7000:00UTC01Jan7000:00UTC1B - `, + name: "container list test", + args: []string{}, + stdout: `test 1 kernel`, inDb: `WW_INTERNAL: 43 nodeprofiles: default: {} @@ -87,11 +85,8 @@ WW_INTERNAL: 0 stdoutW.Close() stdout := <-stdoutC - stdout = strings.TrimSpace(stdout) - stdout = strings.ReplaceAll(stdout, " ", "") assert.NotEmpty(t, stdout, "os.stdout should not be empty") - tt.stdout = strings.ReplaceAll(strings.TrimSpace(tt.stdout), " ", "") - if stdout != strings.ReplaceAll(strings.TrimSpace(tt.stdout), " ", "") { + if !strings.Contains(stdout, tt.stdout) { t.Errorf("Got wrong output, got:\n '%s'\n, but want:\n '%s'\n", stdout, tt.stdout) t.FailNow() }