particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests/image: extract withTempDir helper

Browse source 
It will be needed on another place at some point, I promise.
This commit is contained in:
Ondřej Budai 2020-04-02 10:47:21 +02:00 • committed by Tom Gundersen
parent ca3c469bdc
commit 1a8379f2cd
1 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

50
cmd/osbuild-image-tests/context-managers.go
View file

@ -48,6 +48,22 @@ func withTempFile(dir, pattern string, f func(file *os.File) error) error {
return f(tempFile)
}
func withTempDir(dir, pattern string, f func(dir string) error) error {
tempDir, err := ioutil.TempDir(dir, pattern)
if err != nil {
return fmt.Errorf("cannot create the temporary directory %#v", err)
}
defer func() {
err := os.RemoveAll(tempDir)
if err != nil {
log.Printf("cannot remove the temporary directory: %#v", err)
}
}()
return f(tempDir)
}
// writeCloudInitSO creates cloud-init iso from specified userData and
// metaData and writes it to the writer
func writeCloudInitISO(writer io.Writer, userData, metaData string) error {
@ -173,30 +189,20 @@ func withBootedNspawnDirectory(dir, name string, ns netNS, f func() error) error
// a path to the result to the function f. The result is deleted
// immediately after the function returns.
func withExtractedTarArchive(archive string, f func(dir string) error) error {
dir, err := ioutil.TempDir("", "tar-archive")
if err != nil {
return fmt.Errorf("cannot create a temporary dir: %#v", err)
}
return withTempDir("", "tar-archive", func(dir string) error {
cmd := exec.Command(
"tar",
"xf", archive,
"-C", dir,
)
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
defer func() {
err := os.RemoveAll(dir)
err := cmd.Run()
if err != nil {
log.Printf("cannot remove the temporary dir: %#v", err)
return fmt.Errorf("cannot untar the archive: %#v", err)
}
}()
cmd := exec.Command(
"tar",
"xf", archive,
"-C", dir,
)
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
err = cmd.Run()
if err != nil {
return fmt.Errorf("cannot untar the archive: %#v", err)
}
return f(dir)
return f(dir)
})
}