Merge pull request #1306 from anderbubble/split-test-overlays

Split overlays into discrete functionality and test

internal/pkg/testenv/testenv.go

@@ -42,7 +42,6 @@ const Systemddir = "usr/lib/systemd/system"
 const WWOverlaydir = "var/lib/warewulf/overlays"
 const WWChrootdir = "var/lib/warewulf/chroots"
 const WWProvisiondir = "srv/warewulf"
-const WWClientdir = "warewulf"
 
 // New creates a test environment in a temporary directory and configures
 // Warewulf to use it.
@@ -79,7 +78,7 @@ func New(t *testing.T) (env *TestEnv) {
 	conf.Paths.WWOverlaydir = env.GetPath(WWOverlaydir)
 	conf.Paths.WWChrootdir = env.GetPath(WWChrootdir)
 	conf.Paths.WWProvisiondir = env.GetPath(WWProvisiondir)
-	conf.Paths.WWClientdir = env.GetPath(WWClientdir)
+	conf.Paths.WWClientdir = "/warewulf"
 
 	for _, confPath := range []string{
 		conf.Paths.Sysconfdir,
@@ -93,7 +92,6 @@ func New(t *testing.T) (env *TestEnv) {
 		conf.Paths.WWOverlaydir,
 		conf.Paths.WWChrootdir,
 		conf.Paths.WWProvisiondir,
-		conf.Paths.WWClientdir,
 	} {
 		env.MkdirAll(t, confPath)
 	}
@@ -138,6 +136,15 @@ func (env *TestEnv) WriteFile(t *testing.T, fileName string, content string) {
 	assert.NoError(t, err)
 }
 
+// ImportFile writes the contents of inputFileName to fileName,
+// creating any necessary intermediate directories relative to the
+// test environment.
+func (env *TestEnv) ImportFile(t *testing.T, fileName string, inputFileName string) {
+	buffer, err := os.ReadFile(inputFileName)
+	assert.NoError(t, err)
+	env.WriteFile(t, fileName, string(buffer))
+}
+
 // ReadFile returns the content of fileName as converted to a
 // string.
 //