From d37b89384edebb2190a9e1b2a86fa993e729f24e Mon Sep 17 00:00:00 2001 From: Paul Mars Date: Tue, 24 Oct 2023 08:19:08 +0200 Subject: [PATCH] Fix tests to use gadget "install" folder --- internal/statemachine/classic_test.go | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/internal/statemachine/classic_test.go b/internal/statemachine/classic_test.go index b5a45885..d9fc25f7 100644 --- a/internal/statemachine/classic_test.go +++ b/internal/statemachine/classic_test.go @@ -429,9 +429,12 @@ func TestPrepareGadgetTree(t *testing.T) { asserter.AssertErrNil(err, true) // place a test gadget tree in the scratch directory so we don't have to build one + gadgetDir := filepath.Join(stateMachine.tempDirs.scratch, "gadget") + err = os.MkdirAll(gadgetDir, 0755) + asserter.AssertErrNil(err, true) + gadgetSource := filepath.Join("testdata", "gadget_tree") - gadgetDest := filepath.Join(stateMachine.tempDirs.scratch, "gadget", "install") - err = osutil.CopySpecialFile(gadgetSource, gadgetDest) + err = osutil.CopySpecialFile(gadgetSource, filepath.Join(gadgetDir, "install")) asserter.AssertErrNil(err, true) err = stateMachine.prepareGadgetTree() @@ -503,9 +506,12 @@ func TestFailedPrepareGadgetTree(t *testing.T) { asserter.AssertErrNil(err, true) // place a test gadget tree in the scratch directory so we don't have to build one + gadgetDir := filepath.Join(stateMachine.tempDirs.scratch, "gadget") + err = os.MkdirAll(gadgetDir, 0755) + asserter.AssertErrNil(err, true) + gadgetSource := filepath.Join("testdata", "gadget_tree") - gadgetDest := filepath.Join(stateMachine.tempDirs.scratch, "gadget", "install") - err = osutil.CopySpecialFile(gadgetSource, gadgetDest) + err = osutil.CopySpecialFile(gadgetSource, filepath.Join(gadgetDir, "install")) asserter.AssertErrNil(err, true) // mock os.Mkdir @@ -4235,8 +4241,12 @@ func TestFailedUpdateBootloader(t *testing.T) { // place a test gadget tree in the scratch directory so we don't // have to build one + gadgetDir := filepath.Join(stateMachine.tempDirs.scratch, "gadget") + err = os.MkdirAll(gadgetDir, 0755) + asserter.AssertErrNil(err, true) + gadgetSource := filepath.Join("testdata", "gadget_tree") - gadgetDest := filepath.Join(stateMachine.tempDirs.scratch, "gadget", "install") + gadgetDest := filepath.Join(gadgetDir, "install") err = osutil.CopySpecialFile(gadgetSource, gadgetDest) asserter.AssertErrNil(err, true) // also copy gadget.yaml to the root of the scratch/gadget dir @@ -4294,8 +4304,12 @@ func TestUnsupportedBootloader(t *testing.T) { // place a test gadget tree in the scratch directory so we don't // have to build one + gadgetDir := filepath.Join(stateMachine.tempDirs.scratch, "gadget") + err = os.MkdirAll(gadgetDir, 0755) + asserter.AssertErrNil(err, true) + gadgetSource := filepath.Join("testdata", "gadget_tree") - gadgetDest := filepath.Join(stateMachine.tempDirs.scratch, "gadget", "install") + gadgetDest := filepath.Join(gadgetDir, "install") err = osutil.CopySpecialFile(gadgetSource, gadgetDest) asserter.AssertErrNil(err, true) // also copy gadget.yaml to the root of the scratch/gadget dir