From e2c03ce863258a1a81cc069051a2e2a825eaa90f Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 21 Nov 2024 15:13:28 +0100 Subject: [PATCH] added test for precedence Signed-off-by: Christian Goll --- internal/app/wwctl/overlay/show/main_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/internal/app/wwctl/overlay/show/main_test.go b/internal/app/wwctl/overlay/show/main_test.go index e341b644..ae7cdff4 100644 --- a/internal/app/wwctl/overlay/show/main_test.go +++ b/internal/app/wwctl/overlay/show/main_test.go @@ -71,6 +71,8 @@ nodes: env.WriteFile(t, path.Join(testenv.WWOverlaydir, "testoverlay/email.ww"), overlayEmail) env.WriteFile(t, path.Join(testenv.WWOverlaydir, "testoverlay/overlay.ww"), overlayOverlay) + env.WriteFile(t, path.Join(testenv.WWOverlaydir, "dist/foo.ww"), "foo") + env.WriteFile(t, path.Join(testenv.Sysconfdir, "overlays/dist/foo.ww"), "foobaar") defer env.RemoveAll(t) warewulfd.SetNoDaemon() t.Run("overlay show raw", func(t *testing.T) { @@ -128,6 +130,17 @@ nodes: assert.NoError(t, err) assert.Contains(t, buf.String(), "testoverlay") }) + t.Run("site overlays precede", func(t *testing.T) { + baseCmd.SetArgs([]string{"-r", "node1", "dist", "foo.ww"}) + baseCmd := GetCommand() + buf := new(bytes.Buffer) + baseCmd.SetOut(buf) + baseCmd.SetErr(buf) + wwlog.SetLogWriter(buf) + err := baseCmd.Execute() + assert.NoError(t, err) + assert.Contains(t, buf.String(), "foobaar") + }) } func TestShowServerTemplate(t *testing.T) {