From 71a177cf4bcffde193ac8136cee3fe3d6aeff0df Mon Sep 17 00:00:00 2001
From: Max Chechel <hexdigest@gmail.com>
Date: Mon, 14 Jan 2019 21:56:39 +0300
Subject: [PATCH] goroutines are back

License: MIT
Signed-off-by: Max Chechel <hexdigest@gmail.com>
---
 fuse/readonly/ipfs_test.go | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go
index f7d5fb2e0..4b4ef0fc6 100644
--- a/fuse/readonly/ipfs_test.go
+++ b/fuse/readonly/ipfs_test.go
@@ -5,13 +5,14 @@ package readonly
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
 	"os"
 	"path"
-	"strconv"
 	"strings"
+	"sync"
 	"testing"
 
 	core "github.com/ipfs/go-ipfs/core"
@@ -163,22 +164,24 @@ func TestIpfsStressRead(t *testing.T) {
 		paths = append(paths, npaths...)
 	}
 
-	t.Parallel()
+	// Now read a bunch, concurrently
+	wg := sync.WaitGroup{}
+	errs := make(chan error)
 
 	for s := 0; s < 4; s++ {
-		t.Run(strconv.Itoa(s), func(t *testing.T) {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+
 			for i := 0; i < 2000; i++ {
-				item, err := iface.ParsePath(paths[rand.Intn(len(paths))])
-				if err != nil {
-					t.Fatal(err)
-				}
+				item, _ := iface.ParsePath(paths[rand.Intn(len(paths))])
 
 				relpath := strings.Replace(item.String(), item.Namespace(), "", 1)
 				fname := path.Join(mnt.Dir, relpath)
 
 				rbuf, err := ioutil.ReadFile(fname)
 				if err != nil {
-					t.Fatal(err)
+					errs <- err
 				}
 
 				//nd.Context() is never closed which leads to
@@ -187,21 +190,32 @@ func TestIpfsStressRead(t *testing.T) {
 
 				read, err := api.Unixfs().Get(ctx, item)
 				if err != nil {
-					t.Fatal(err)
+					errs <- err
 				}
 
 				data, err := ioutil.ReadAll(read.(files.File))
 				if err != nil {
-					t.Fatal(err)
+					errs <- err
 				}
 
 				cancelFunc()
 
 				if !bytes.Equal(rbuf, data) {
-					t.Fatal("incorrect read")
+					errs <- errors.New("incorrect read")
 				}
 			}
-		})
+		}()
+	}
+
+	go func() {
+		wg.Wait()
+		close(errs)
+	}()
+
+	for err := range errs {
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 }