Merge pull request #2817 from oasislabs/ptrus/feature/txsource-timeou…

…t-watcher oasis-test-runner/txsource: disable LogAssertNoTimeouts if restarts
oasisprotocol · Apr 3, 2020 · 960804e · 960804e
2 parents ce667e7 + b960a64
commit 960804e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.changelog/2817.internal.md b/.changelog/2817.internal.md
@@ -0,0 +1 @@
+oasis-test-runner/txsource: disable LogAssertNoTimeouts if restarts
diff --git a/go/oasis-test-runner/scenario/e2e/txsource.go b/go/oasis-test-runner/scenario/e2e/txsource.go
@@ -19,6 +19,7 @@ import (
 	"github.com/oasislabs/oasis-core/go/oasis-node/cmd/debug/txsource"
 	"github.com/oasislabs/oasis-core/go/oasis-node/cmd/debug/txsource/workload"
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/env"
+	"github.com/oasislabs/oasis-core/go/oasis-test-runner/log"
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/oasis"
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/scenario"
 )
@@ -93,6 +94,15 @@ func (sc *txSourceImpl) Fixture() (*oasis.NetworkFixture, error) {
 	f.Network.DeterministicIdentities = true
 	f.Network.StakingGenesis = "tests/fixture-data/txsource/staking-genesis.json"
 
+	if sc.nodeRestartInterval > 0 {
+		// If node restarts enabled, do not enable round timeouts log watcher.
+		f.Network.DefaultLogWatcherHandlerFactories = []log.WatcherHandlerFactory{
+			oasis.LogAssertNoRoundFailures(),
+			oasis.LogAssertNoExecutionDiscrepancyDetected(),
+			oasis.LogAssertNoMergeDiscrepancyDetected(),
+		}
+	}
+
 	// Disable CheckTx on the client node so we can submit invalid transactions.
 	f.Clients[0].ConsensusDisableCheckTx = true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		oasis-test-runner/txsource: disable LogAssertNoTimeouts if restarts