From df9a3aca8d10e01e1df17d4b0850a25e0d8110b7 Mon Sep 17 00:00:00 2001
From: Luca Moser <moser.luca@gmail.com>
Date: Mon, 15 Jun 2020 15:56:46 +0200
Subject: [PATCH] lower amount of peers
---
tools/integration-tests/tester/framework/docker.go | 2 +-
.../tester/tests/consensus/consensus_conflicts_test.go | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/integration-tests/tester/framework/docker.go b/tools/integration-tests/tester/framework/docker.go
index 86b42d77..506c10d1 100644
--- a/tools/integration-tests/tester/framework/docker.go
+++ b/tools/integration-tests/tester/framework/docker.go
@@ -157,7 +157,7 @@ func (d *DockerContainer) CreatePumba(name string, containerName string, targetI
cmd = append(cmd, slice...)
containerConfig := &container.Config{
- Image: "gaiaadm/pumba:latest",
+ Image: "gaiaadm/pumba:0.7.2",
Cmd: cmd,
}
diff --git a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
index ceecb87b..feee165c 100644
--- a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
+++ b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
@@ -22,11 +22,11 @@ import (
// then issues valid value objects spending the genesis in both, deletes the partitions (and lets them merge)
// and then checks that the conflicts are resolved via FPC.
func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
- n, err := f.CreateNetworkWithPartitions("consensus_TestConsensusConflicts", 8, 2, 4)
+ n, err := f.CreateNetworkWithPartitions("fiftyfifty", 6, 2, 2)
require.NoError(t, err)
defer tests.ShutdownNetwork(t, n)
- time.Sleep(5 * time.Second)
+ time.Sleep(10 * time.Second)
// split the network
for i, partition := range n.Partitions() {
@@ -111,7 +111,7 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
log.Println("merging partitions...")
assert.NoError(t, n.DeletePartitions(), "merging the network partitions should work")
log.Println("waiting for resolved partitions to autopeer to each other")
- err = n.WaitForAutopeering(5)
+ err = n.WaitForAutopeering(4)
require.NoError(t, err)
// ensure message flow so that both partitions will get the conflicting tx
--
GitLab