From 89af022e4c9aa29256931ff85436ea04d9bdf256 Mon Sep 17 00:00:00 2001
From: Luca Moser <moser.luca@gmail.com>
Date: Tue, 16 Jun 2020 13:04:44 +0200
Subject: [PATCH] reset integration framework paras
---
tools/integration-tests/tester/go.mod | 1 +
tools/integration-tests/tester/go.sum | 1 +
.../tester/tests/consensus/consensus_conflicts_test.go | 8 ++++++++
3 files changed, 10 insertions(+)
diff --git a/tools/integration-tests/tester/go.mod b/tools/integration-tests/tester/go.mod
index fb238056..bc7188a1 100644
--- a/tools/integration-tests/tester/go.mod
+++ b/tools/integration-tests/tester/go.mod
@@ -12,6 +12,7 @@ require (
github.com/iotaledger/goshimmer v0.1.3
github.com/iotaledger/hive.go v0.0.0-20200610104211-d603429af242
github.com/mr-tron/base58 v1.1.3
+ github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/stretchr/testify v1.6.1
)
diff --git a/tools/integration-tests/tester/go.sum b/tools/integration-tests/tester/go.sum
index 8d1d03b6..e26c830f 100644
--- a/tools/integration-tests/tester/go.sum
+++ b/tools/integration-tests/tester/go.sum
@@ -121,6 +121,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
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 9a391f20..46fbc4ca 100644
--- a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
+++ b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
@@ -25,9 +25,17 @@ import (
func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
// override avg. network delay to accustom integration test slowness
+ backupFCoBAvgNetworkDelay := framework.ParaFCoBAverageNetworkDelay
+ backupBootstrapOnEveryNode := framework.ParaBootstrapOnEveryNode
framework.ParaFCoBAverageNetworkDelay = 90
framework.ParaBootstrapOnEveryNode = true
+ // reset framework paras
+ defer func() {
+ framework.ParaFCoBAverageNetworkDelay = backupFCoBAvgNetworkDelay
+ framework.ParaBootstrapOnEveryNode = backupBootstrapOnEveryNode
+ }()
+
// create two partitions with their own peers
n, err := f.CreateNetworkWithPartitions("abc", 6, 2, 2)
require.NoError(t, err)
--
GitLab