chore: properly cleanup test folder.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
falcosecurity · Aug 25, 2023 · 916df71 · 916df71
1 parent 011dab0
commit 916df71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/pkg/autogenerate/autogenerate_test.go b/pkg/autogenerate/autogenerate_test.go
@@ -10,13 +10,7 @@ import (
 	"testing"
 )
 
-func preCreateFolders(opts Options) (func(), error) {
-	toBeRemoved := make([]string, 0)
-	f := func() {
-		for _, path := range toBeRemoved {
-			_ = os.RemoveAll(path)
-		}
-	}
+func preCreateFolders(opts Options) error {
 	for _, driverVersion := range opts.DriverVersion {
 		configPath := fmt.Sprintf(root.ConfigPathFmt,
 			opts.RepoRoot,
@@ -25,11 +19,10 @@ func preCreateFolders(opts Options) (func(), error) {
 			"")
 		err := os.MkdirAll(configPath, 0700)
 		if err != nil {
-			return f, err
+			return err
 		}
-		toBeRemoved = append(toBeRemoved, configPath)
 	}
-	return f, nil
+	return nil
 }
 
 func TestAutogenerate(t *testing.T) {
@@ -106,8 +99,10 @@ func TestAutogenerate(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			cleanup, err := preCreateFolders(test.opts)
-			t.Cleanup(cleanup)
+			err := preCreateFolders(test.opts)
+			t.Cleanup(func() {
+				os.RemoveAll(test.opts.RepoRoot)
+			})
 			assert.NoError(t, err)
 			err = generateConfigs(test.opts, jsonData)
 			if test.expectError {

diff --git a/pkg/cleanup/cleanup_test.go b/pkg/cleanup/cleanup_test.go
@@ -8,13 +8,7 @@ import (
 	"testing"
 )
 
-func preCreateFolders(opts Options, driverVersionsToBeCreated []string) (func(), error) {
-	toBeRemoved := make([]string, 0)
-	f := func() {
-		for _, path := range toBeRemoved {
-			_ = os.RemoveAll(path)
-		}
-	}
+func preCreateFolders(opts Options, driverVersionsToBeCreated []string) error {
 	for _, driverVersion := range driverVersionsToBeCreated {
 		configPath := fmt.Sprintf(root.ConfigPathFmt,
 			opts.RepoRoot,
@@ -23,11 +17,10 @@ func preCreateFolders(opts Options, driverVersionsToBeCreated []string) (func(),
 			"")
 		err := os.MkdirAll(configPath, 0700)
 		if err != nil {
-			return f, err
+			return err
 		}
-		toBeRemoved = append(toBeRemoved, configPath)
 	}
-	return f, nil
+	return nil
 }
 
 // difference returns the elements in `a` that aren't in `b`.
@@ -76,8 +69,10 @@ func TestCleanup(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			cleanup, err := preCreateFolders(test.opts, test.driverVersionsToBeCreated)
-			t.Cleanup(cleanup)
+			err := preCreateFolders(test.opts, test.driverVersionsToBeCreated)
+			t.Cleanup(func() {
+				os.RemoveAll(test.opts.RepoRoot)
+			})
 			assert.NoError(t, err)
 			err = Run(test.opts)
 			if test.errorExpected {