提交 56a3f6c0 编写于 作者: J Janoš Guljaš 提交者: Anton Evangelatov

swarm/storage/mock/test: fix T.Fatal inside a goroutine (#18399)

上级 356c49fa
...@@ -196,17 +196,22 @@ func ImportExport(t *testing.T, outStore, inStore mock.GlobalStorer, n int) { ...@@ -196,17 +196,22 @@ func ImportExport(t *testing.T, outStore, inStore mock.GlobalStorer, n int) {
r, w := io.Pipe() r, w := io.Pipe()
defer r.Close() defer r.Close()
exportErrChan := make(chan error)
go func() { go func() {
defer w.Close() defer w.Close()
if _, err := exporter.Export(w); err != nil {
t.Fatalf("export: %v", err) _, err := exporter.Export(w)
} exportErrChan <- err
}() }()
if _, err := importer.Import(r); err != nil { if _, err := importer.Import(r); err != nil {
t.Fatalf("import: %v", err) t.Fatalf("import: %v", err)
} }
if err := <-exportErrChan; err != nil {
t.Fatalf("export: %v", err)
}
for i, addr := range addrs { for i, addr := range addrs {
chunkAddr := storage.Address(append(addr[:], []byte(strconv.FormatInt(int64(i)+1, 16))...)) chunkAddr := storage.Address(append(addr[:], []byte(strconv.FormatInt(int64(i)+1, 16))...))
data := []byte(strconv.FormatInt(int64(i)+1, 16)) data := []byte(strconv.FormatInt(int64(i)+1, 16))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册