From ae149f3e36a9853d06e89d2a5c4fc8094e61d82e Mon Sep 17 00:00:00 2001 From: MatthewHink Date: Thu, 10 Feb 2022 10:12:03 -0500 Subject: [PATCH] Fix hardcoded path in test. Use the configuration setting. --- internal/app/wwctl/configure/dhcp/dhcp_main_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/app/wwctl/configure/dhcp/dhcp_main_test.go b/internal/app/wwctl/configure/dhcp/dhcp_main_test.go index 9aa96fa3..49dc32e8 100644 --- a/internal/app/wwctl/configure/dhcp/dhcp_main_test.go +++ b/internal/app/wwctl/configure/dhcp/dhcp_main_test.go @@ -1,7 +1,10 @@ package dhcp import ( + "path" "testing" + + "github.com/hpcng/warewulf/internal/pkg/buildconfig" ) func TestDhcpTemplateFile(t *testing.T) { @@ -9,9 +12,9 @@ func TestDhcpTemplateFile(t *testing.T) { parameter string expected string }{ - {"", "/usr/local/etc/warewulf/dhcp/default-dhcpd.conf"}, - {"default", "/usr/local/etc/warewulf/dhcp/default-dhcpd.conf"}, - {"static", "/usr/local/etc/warewulf/dhcp/static-dhcpd.conf"}, + {"", path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/default-dhcpd.conf")}, + {"default", path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/default-dhcpd.conf")}, + {"static", path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/static-dhcpd.conf")}, {"/test/absolute/path.conf", "/test/absolute/path.conf"}, } for _, tt := range tests {