oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-03 16:06:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pr 1825 (#1865)

Browse Source 
chore: code cleanup

Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>

---------

Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Co-authored-by: guoguangwu <guoguangwu@magic-shield.com>
This commit is contained in:
Christopher Angelo Phillips
2023-06-05 17:01:00 +00:00
committed by GitHub
co-authored by guoguangwu
parent d676e5e781
commit f07581f504
11 changed files with 23 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/file/zip_file_helpers_test.go
+2 -23
View File
@@ -1,7 +1,6 @@
package file
import (
"io/ioutil"
"os"
"os/exec"
"path"
@@ -73,31 +72,11 @@ func assertNoError(t testing.TB, fn func() error) func() {
func setupZipFileTest(t testing.TB, sourceDirPath string, zip64 bool) string {
t.Helper()
archivePrefix, err := ioutil.TempFile("", "syft-ziputil-archive-TEST-")
if err != nil {
t.Fatalf("unable to create tempfile: %+v", err)
}
t.Cleanup(
assertNoError(t,
func() error {
return os.Remove(archivePrefix.Name())
},
),
)
destinationArchiveFilePath := archivePrefix.Name() + ".zip"
archivePrefix := path.Join(t.TempDir(), "syft-ziputil-archive-TEST-")
destinationArchiveFilePath := archivePrefix + ".zip"
t.Logf("archive path: %s", destinationArchiveFilePath)
createZipArchive(t, sourceDirPath, destinationArchiveFilePath, zip64)
t.Cleanup(
assertNoError(t,
func() error {
return os.Remove(destinationArchiveFilePath)
},
),
)
cwd, err := os.Getwd()
if err != nil {
t.Fatalf("unable to get cwd: %+v", err)