Correctly cleanup temp directory test (zarf-dev#654)

Author: jeff-mccoy

src/test/e2e/01_component_choice_test.go

@@ -31,19 +31,16 @@ func TestComponentChoice(t *testing.T) {
 	require.NoError(t, err, stdOut, stdErr)
 
 	// Verify the file was created
-	expectedFile := firstFile
-	require.FileExists(t, expectedFile)
+	require.FileExists(t, firstFile)
 	// Verify the second choice file was not created
-	expectedFile = secondFile
-	require.NoFileExists(t, expectedFile)
+	require.NoFileExists(t, secondFile)
 
 	// Deploy using default choice
 	stdOut, stdErr, err = e2e.execZarfCommand("package", "deploy", path, "--confirm")
 	require.NoError(t, err, stdOut, stdErr)
 
 	// Verify the file was created
-	expectedFile = secondFile
-	require.FileExists(t, expectedFile)
+	require.FileExists(t, secondFile)
 
 	e2e.cleanFiles(firstFile, secondFile)
 }

src/test/e2e/03_temp_directory_deploy_test.go

@@ -12,12 +12,16 @@ func TestTempDirectoryDeploy(t *testing.T) {
 	t.Log("E2E: Temporary directory deploy")
 
 	// run `zarf package deploy` with a specified tmp location
-	otherTmpPath := "/tmp/othertmp"
+	var (
+		otherTmpPath = "/tmp/othertmp"
+		firstFile    = "first-choice-file.txt"
+		secondFile   = "second-choice-file.txt"
+	)
 
 	e2e.setup(t)
 	defer e2e.teardown(t)
 
-	e2e.cleanFiles(otherTmpPath)
+	e2e.cleanFiles(otherTmpPath, firstFile, secondFile)
 
 	path := fmt.Sprintf("build/zarf-package-component-choice-%s.tar.zst", e2e.arch)
 
@@ -27,5 +31,5 @@ func TestTempDirectoryDeploy(t *testing.T) {
 	require.Contains(t, stdErr, otherTmpPath, "The other tmp path should show as being created")
 	require.NoError(t, err, stdOut, stdErr)
 
-	e2e.cleanFiles(otherTmpPath)
+	e2e.cleanFiles(otherTmpPath, firstFile, secondFile)
 }