From 0e3a050c873c0838b8e661b1bd14ef9059124652 Mon Sep 17 00:00:00 2001
From: Fabio Barone <holistic.computing@gmail.com>
Date: Thu, 26 Jul 2018 19:43:30 -0500
Subject: [PATCH] swarm/network/stream: enforce waitKademlia, improve
 TestIntervals

---
 swarm/network/stream/delivery_test.go  | 14 +++++---------
 swarm/network/stream/intervals_test.go | 13 ++++++-------
 swarm/network/stream/syncer_test.go    |  6 ++----
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go
index 0dbada133c..1478ac2cc8 100644
--- a/swarm/network/stream/delivery_test.go
+++ b/swarm/network/stream/delivery_test.go
@@ -424,11 +424,9 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
 			}
 		}()
 
-		if *waitKademlia {
-			log.Debug("Waiting for kademlia")
-			if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
-				return err
-			}
+		log.Debug("Waiting for kademlia")
+		if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
+			return err
 		}
 
 		log.Debug("Watching for disconnections")
@@ -560,10 +558,8 @@ func benchmarkDeliveryFromNodes(b *testing.B, nodes, conns, chunkCount int, skip
 		}
 		netStore := item.(*storage.NetStore)
 
-		if *waitKademlia {
-			if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
-				return err
-			}
+		if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
+			return err
 		}
 
 		disconnections := sim.PeerEvents(
diff --git a/swarm/network/stream/intervals_test.go b/swarm/network/stream/intervals_test.go
index 70714b35ef..f1b22599c3 100644
--- a/swarm/network/stream/intervals_test.go
+++ b/swarm/network/stream/intervals_test.go
@@ -96,12 +96,13 @@ func testIntervals(t *testing.T, live bool, history *Range, skipCheck bool) {
 	defer sim.Close()
 
 	log.Info("Adding nodes to simulation")
-	_, err := sim.AddNodesAndConnectFull(nodes)
+	_, err := sim.AddNodesAndConnectChain(nodes)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Second)
+	defer cancel()
 
 	result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error {
 		nodeIDs := sim.UpNodeIDs()
@@ -139,11 +140,9 @@ func testIntervals(t *testing.T, live bool, history *Range, skipCheck bool) {
 		liveErrC := make(chan error)
 		historyErrC := make(chan error)
 
-		if *waitKademlia {
-			if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
-				log.Error("WaitKademlia error: %v", "err", err)
-				return err
-			}
+		if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
+			log.Error("WaitKademlia error: %v", "err", err)
+			return err
 		}
 
 		log.Debug("Watching for disconnections")
diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go
index 8e5d937d9b..74e53c127f 100644
--- a/swarm/network/stream/syncer_test.go
+++ b/swarm/network/stream/syncer_test.go
@@ -181,10 +181,8 @@ func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
 			}
 		}
 		// here we distribute chunks of a random file into stores 1...nodes
-		if *waitKademlia {
-			if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
-				return err
-			}
+		if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
+			return err
 		}
 
 		// collect hashes in po 1 bin for each node