Skip to content

Commit 8214e15

Browse files
authored
Merge pull request #469 from kolyshkin/nits
import1 test fixes
2 parents c063bef + 3c6acce commit 8214e15

File tree

1 file changed

+39
-24
lines changed

1 file changed

+39
-24
lines changed

import1/dbus_test.go

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,46 @@ import (
1818
"log"
1919
"net/http"
2020
"os"
21+
"os/exec"
2122
"path/filepath"
2223
"strings"
2324
"testing"
25+
"time"
2426
)
2527

2628
const (
2729
importPrefix = "importd-test-"
2830
)
2931

32+
func cleanupImport(t *testing.T, name string) {
33+
t.Cleanup(func() {
34+
var (
35+
out []byte
36+
err error
37+
dur = 500 * time.Millisecond
38+
)
39+
for range 5 {
40+
time.Sleep(dur)
41+
out, err = exec.Command("machinectl", "remove", name).CombinedOutput()
42+
if err == nil {
43+
return
44+
}
45+
dur *= 2
46+
}
47+
t.Fatalf("machinectl remove %s failed: %v\noutput: %s", name, err, out)
48+
})
49+
}
50+
3051
func TestImportTar(t *testing.T) {
3152
conn, err := New()
3253
if err != nil {
3354
t.Fatal(err)
3455
}
3556

36-
f, err := os.Open(findFixture("image.tar.xz", t))
37-
if err != nil {
38-
t.Fatal(err)
39-
}
40-
41-
_, err = conn.ImportTar(f, importPrefix+"ImportTar", true, true)
57+
f := openFixture(t, "image.tar.xz")
58+
name := importPrefix + "ImportTar"
59+
cleanupImport(t, name)
60+
_, err = conn.ImportTar(f, name, true, true)
4261
if err != nil {
4362
t.Fatal(err)
4463
}
@@ -50,12 +69,10 @@ func TestImportRaw(t *testing.T) {
5069
t.Fatal(err)
5170
}
5271

53-
f, err := os.Open(findFixture("image.raw.xz", t))
54-
if err != nil {
55-
t.Fatal(err)
56-
}
57-
58-
_, err = conn.ImportRaw(f, importPrefix+"ImportRaw", true, true)
72+
f := openFixture(t, "image.raw.xz")
73+
name := importPrefix + "ImportRaw"
74+
cleanupImport(t, name)
75+
_, err = conn.ImportRaw(f, name, true, true)
5976
if err != nil {
6077
t.Fatal(err)
6178
}
@@ -67,11 +84,7 @@ func TestExportTar(t *testing.T) {
6784
t.Fatal(err)
6885
}
6986

70-
err = os.MkdirAll("tmp/", os.ModeDir|0o755)
71-
if err != nil {
72-
t.Fatal(err)
73-
}
74-
f, err := os.Create("tmp/image-export.tar.xz")
87+
f, err := os.Create(t.TempDir() + "image-export.tar.xz")
7588
if err != nil {
7689
t.Fatal(err)
7790
}
@@ -88,11 +101,7 @@ func TestExportRaw(t *testing.T) {
88101
t.Fatal(err)
89102
}
90103

91-
err = os.MkdirAll("tmp/", os.ModeDir|0o755)
92-
if err != nil {
93-
t.Fatal(err)
94-
}
95-
f, err := os.Create("tmp/image-export.raw.xz")
104+
f, err := os.Create(t.TempDir() + "image-export.raw.xz")
96105
if err != nil {
97106
t.Fatal(err)
98107
}
@@ -158,12 +167,18 @@ func TestListAndCancelTransfers(t *testing.T) {
158167
}
159168
}
160169

161-
func findFixture(target string, t *testing.T) string {
170+
func openFixture(t *testing.T, target string) *os.File {
162171
abs, err := filepath.Abs("../fixtures/" + target)
163172
if err != nil {
164173
t.Fatal(err)
165174
}
166-
return abs
175+
176+
f, err := os.Open(abs)
177+
if err != nil {
178+
t.Fatal(err)
179+
}
180+
181+
return f
167182
}
168183

169184
func init() {

0 commit comments

Comments
 (0)