From 1f731cd01688bb66a80bf92d1d64dee1555b40ed Mon Sep 17 00:00:00 2001 From: Janos Guljas Date: Fri, 26 Jan 2018 12:19:10 +0100 Subject: [PATCH] swarm/network/stream: Fix TestDeliveryFromNodes --- swarm/network/stream/delivery_test.go | 7 ++----- swarm/network/stream/syncer_test.go | 11 +++-------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index 05bac692e0..e55e78aee9 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -381,14 +381,13 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck for j := 0; j < nodes-1; j++ { id := sim.IDs[j] err := sim.CallClient(id, func(client *rpc.Client) error { - err := streamTesting.WatchDisconnections(sim.IDs[j], client, peerCount(sim.IDs[j]), errc, quitC) + err := streamTesting.WatchDisconnections(id, client, peerCount(id), errc, quitC) if err != nil { return err } ctx, cancel := context.WithTimeout(ctx, 1*time.Second) defer cancel() - j++ - sid := sim.IDs[j] + sid := sim.IDs[j+1] return client.CallContext(ctx, nil, "stream_subscribeStream", sid, swarmChunkServerStreamName, nil, 0, 0, Top, false) }) if err != nil { @@ -416,9 +415,7 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck }() return nil } - checkC := make(chan struct{}) check := func(ctx context.Context, id discover.NodeID) (bool, error) { - defer func() { checkC <- struct{}{} }() select { case err := <-errc: return false, err diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index 1bcd5fe1aa..72f4a53b4b 100644 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -37,15 +37,10 @@ import ( const dataChunkCount = 1000 func TestSyncerSimulation(t *testing.T) { - // testSyncBetweenNodes(t, 2, 1, dataChunkCount, true, 1) - // testSyncBetweenNodes(t, 2, 1, dataChunkCount, false, 1) - // testSyncBetweenNodes(t, 4, 1, dataChunkCount, true, 1) - // // testSyncBetweenNodes(t, 4, 1, dataChunkCount, false, 1) - // testSyncBetweenNodes(t, 8, 1, dataChunkCount, true, 1) - // // testSyncBetweenNodes(t, 8, 1, dataChunkCount, false, 1) + testSyncBetweenNodes(t, 2, 1, dataChunkCount, true, 1) + testSyncBetweenNodes(t, 4, 1, dataChunkCount, true, 1) + testSyncBetweenNodes(t, 8, 1, dataChunkCount, true, 1) testSyncBetweenNodes(t, 16, 1, dataChunkCount, true, 1) - // testSyncBetweenNodes(t, 32, 1, dataChunkCount, true, 1) - // testSyncBetweenNodes(t, 16, 1, dataChunkCount, false, 1) } func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck bool, po uint8) {