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

Merge pull request #288 from MatthewHink/mhink-prefix

Browse Source 
Fix hardcoded path in test. Use the configuration setting.
This commit is contained in:
Gregory M. Kurtzer
2022-02-10 08:47:27 -08:00
committed by GitHub
parent 781042b8fe ae149f3e36
commit 89bad1ff76
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/app/wwctl/configure/dhcp/dhcp_main_test.go
View File

@@ -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 {