From 8efec499a257cdcdb094de48bdffc4636ebcadbd Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 7 Nov 2024 22:25:32 -0700 Subject: [PATCH] Revert changes to testenv and fix bmc tests Signed-off-by: Jonathon Anderson --- internal/app/wwctl/node/sensors/root_test.go | 1 + internal/app/wwctl/power/cycle/root_test.go | 1 + internal/app/wwctl/power/off/root_test.go | 1 + internal/app/wwctl/power/on/root_test.go | 1 + internal/app/wwctl/power/reset/root_test.go | 1 + internal/app/wwctl/power/soft/root_test.go | 1 + internal/app/wwctl/power/status/root_test.go | 1 + internal/pkg/testenv/testenv.go | 20 +++----------------- 8 files changed, 10 insertions(+), 17 deletions(-) diff --git a/internal/app/wwctl/node/sensors/root_test.go b/internal/app/wwctl/node/sensors/root_test.go index bd2b74bd..3fff5f6a 100644 --- a/internal/app/wwctl/node/sensors/root_test.go +++ b/internal/app/wwctl/node/sensors/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/app/wwctl/power/cycle/root_test.go b/internal/app/wwctl/power/cycle/root_test.go index 997a048f..89ba118c 100644 --- a/internal/app/wwctl/power/cycle/root_test.go +++ b/internal/app/wwctl/power/cycle/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/app/wwctl/power/off/root_test.go b/internal/app/wwctl/power/off/root_test.go index a0c6952f..4dd31141 100644 --- a/internal/app/wwctl/power/off/root_test.go +++ b/internal/app/wwctl/power/off/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/app/wwctl/power/on/root_test.go b/internal/app/wwctl/power/on/root_test.go index 26fab1ff..82485f10 100644 --- a/internal/app/wwctl/power/on/root_test.go +++ b/internal/app/wwctl/power/on/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/app/wwctl/power/reset/root_test.go b/internal/app/wwctl/power/reset/root_test.go index 9f8c8552..131f831a 100644 --- a/internal/app/wwctl/power/reset/root_test.go +++ b/internal/app/wwctl/power/reset/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/app/wwctl/power/soft/root_test.go b/internal/app/wwctl/power/soft/root_test.go index 7eb0ff1a..14728692 100644 --- a/internal/app/wwctl/power/soft/root_test.go +++ b/internal/app/wwctl/power/soft/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/app/wwctl/power/status/root_test.go b/internal/app/wwctl/power/status/root_test.go index e6bbbe98..e7160e3e 100644 --- a/internal/app/wwctl/power/status/root_test.go +++ b/internal/app/wwctl/power/status/root_test.go @@ -28,6 +28,7 @@ nodes: - default ipmi: ipaddr: 10.10.10.10`) + env.ImportFile(t, "share/warewulf/bmc/ipmitool.tmpl", "../../../../../lib/warewulf/bmc/ipmitool.tmpl") tests := map[string]struct { args []string diff --git a/internal/pkg/testenv/testenv.go b/internal/pkg/testenv/testenv.go index 1afc6c63..94d88a83 100644 --- a/internal/pkg/testenv/testenv.go +++ b/internal/pkg/testenv/testenv.go @@ -9,7 +9,6 @@ import ( "os" "path" "path/filepath" - "runtime" "testing" "time" @@ -17,7 +16,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/warewulf/warewulf/internal/pkg/node" - "github.com/warewulf/warewulf/internal/pkg/util" ) const initWarewulfConf = `WW_INTERNAL: 0` @@ -95,15 +93,9 @@ func New(t *testing.T) (env *TestEnv) { conf.Paths.WWChrootdir, conf.Paths.WWProvisiondir, } { - env.MkdirAllAbs(t, confPath) + env.MkdirAll(t, confPath) } - // copy templates - _, b, _, _ := runtime.Caller(0) - basepath := filepath.Dir(b) - env.MkdirAllAbs(t, path.Join(conf.Warewulf.DataStore, "warewulf/bmc")) - assert.DirExists(t, path.Join(conf.Warewulf.DataStore, "warewulf/bmc")) - err = util.CopyFile(path.Join(basepath, "../../../lib/warewulf/bmc/ipmitool.tmpl"), path.Join(conf.Warewulf.DataStore, "warewulf/bmc/ipmitool.tmpl")) - assert.NoError(t, err) + // node.init() has already run, so set the config path again node.ConfigFile = env.GetPath(path.Join(Sysconfdir, "warewulf/nodes.conf")) @@ -118,19 +110,13 @@ func (env *TestEnv) GetPath(fileName string) string { // MkdirAll creates dirName and any intermediate directories relative // to the test environment. +// // Asserts no errors occur. func (env *TestEnv) MkdirAll(t *testing.T, dirName string) { err := os.MkdirAll(env.GetPath(dirName), 0755) assert.NoError(t, err) } -// MkdirAllAbs creates absolute dirName and any intermediate directories -// Asserts no errors occur. -func (env *TestEnv) MkdirAllAbs(t *testing.T, dirName string) { - err := os.MkdirAll(dirName, 0755) - assert.NoError(t, err) -} - // WriteFile writes content to fileName, creating any necessary // intermediate directories relative to the test environment. //