Skip to content

import1: test fixes #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2025
Merged

import1: test fixes #469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f51dd8
import1: use t.TempDir
kolyshkin Aug 18, 2025
3c6acce
import1: fix TestImport* cleanup
kolyshkin Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 39 additions & 24 deletions import1/dbus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,46 @@ import (
"log"
"net/http"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
"time"
)

const (
importPrefix = "importd-test-"
)

func cleanupImport(t *testing.T, name string) {
t.Cleanup(func() {
var (
out []byte
err error
dur = 500 * time.Millisecond
)
for range 5 {
time.Sleep(dur)
out, err = exec.Command("machinectl", "remove", name).CombinedOutput()
if err == nil {
return
}
dur *= 2
}
t.Fatalf("machinectl remove %s failed: %v\noutput: %s", name, err, out)
})
}

func TestImportTar(t *testing.T) {
conn, err := New()
if err != nil {
t.Fatal(err)
}

f, err := os.Open(findFixture("image.tar.xz", t))
if err != nil {
t.Fatal(err)
}

_, err = conn.ImportTar(f, importPrefix+"ImportTar", true, true)
f := openFixture(t, "image.tar.xz")
name := importPrefix + "ImportTar"
cleanupImport(t, name)
_, err = conn.ImportTar(f, name, true, true)
if err != nil {
t.Fatal(err)
}
Expand All @@ -50,12 +69,10 @@ func TestImportRaw(t *testing.T) {
t.Fatal(err)
}

f, err := os.Open(findFixture("image.raw.xz", t))
if err != nil {
t.Fatal(err)
}

_, err = conn.ImportRaw(f, importPrefix+"ImportRaw", true, true)
f := openFixture(t, "image.raw.xz")
name := importPrefix + "ImportRaw"
cleanupImport(t, name)
_, err = conn.ImportRaw(f, name, true, true)
if err != nil {
t.Fatal(err)
}
Expand All @@ -67,11 +84,7 @@ func TestExportTar(t *testing.T) {
t.Fatal(err)
}

err = os.MkdirAll("tmp/", os.ModeDir|0o755)
if err != nil {
t.Fatal(err)
}
f, err := os.Create("tmp/image-export.tar.xz")
f, err := os.Create(t.TempDir() + "image-export.tar.xz")
if err != nil {
t.Fatal(err)
}
Expand All @@ -88,11 +101,7 @@ func TestExportRaw(t *testing.T) {
t.Fatal(err)
}

err = os.MkdirAll("tmp/", os.ModeDir|0o755)
if err != nil {
t.Fatal(err)
}
f, err := os.Create("tmp/image-export.raw.xz")
f, err := os.Create(t.TempDir() + "image-export.raw.xz")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -158,12 +167,18 @@ func TestListAndCancelTransfers(t *testing.T) {
}
}

func findFixture(target string, t *testing.T) string {
func openFixture(t *testing.T, target string) *os.File {
abs, err := filepath.Abs("../fixtures/" + target)
if err != nil {
t.Fatal(err)
}
return abs

f, err := os.Open(abs)
if err != nil {
t.Fatal(err)
}

return f
}

func init() {
Expand Down