test/supernode_client/main: fix t.Fatal in a goroutine

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>

test/supernode_client/main.go

@@ -142,24 +142,34 @@ func sizeOfIthFile(i int64) int64 {
 }
 
 func runFileAddingWorker(n *core.IpfsNode) error {
+	errs := make(chan error, math.MaxInt32)
 	go func() {
 		var i int64
 		for i = 1; i < math.MaxInt32; i++ {
 			piper, pipew := io.Pipe()
 			go func() {
 				defer pipew.Close()
 				if err := random.WritePseudoRandomBytes(sizeOfIthFile(i), pipew, *seed); err != nil {
-					log.Fatal(err)
+					errs <- err
 				}
 			}()
 			k, err := coreunix.Add(n, piper)
 			if err != nil {
-				log.Fatal(err)
+				errs <- err
 			}
 			log.Println("added file", "seed", *seed, "#", i, "key", k, "size", unit.Information(sizeOfIthFile(i)))
 			time.Sleep(1 * time.Second)
 		}
 	}()
+
+	var i int64
+	for i = 0; i < math.MaxInt32; i++ {
+		err := <-errs
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	return nil
 }
 
@@ -180,18 +190,20 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error {
 		return err
 	}
 
+	errs := make(chan error, 1)
+
 	go func() {
 		defer dummy.Close()
 		var i int64 = 1
 		for {
 			buf := new(bytes.Buffer)
 			if err := random.WritePseudoRandomBytes(sizeOfIthFile(i), buf, *seed); err != nil {
-				log.Fatal(err)
+				errs <- err
 			}
 			// add to a dummy node to discover the key
 			k, err := coreunix.Add(dummy, bytes.NewReader(buf.Bytes()))
 			if err != nil {
-				log.Fatal(err)
+				errs <- err
 			}
 			e := elog.EventBegin(ctx, "cat", logging.LoggableF(func() map[string]interface{} {
 				return map[string]interface{}{
@@ -212,6 +224,12 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error {
 			time.Sleep(time.Second)
 		}
 	}()
+
+	err := <-errs
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	return nil
 }