From b5d6d76026e5902dcb9a4093a08d878066e813cb Mon Sep 17 00:00:00 2001 From: Peter Fox Date: Mon, 18 Feb 2019 13:27:27 +0000 Subject: [PATCH] Reverse the spring profile so that lost transaction syncing is off by default --- tessera-core/src/main/resources/tessera-core-spring.xml | 2 +- tests/acceptance-test/src/test/java/admin/cmd/Utils.java | 2 +- .../src/test/java/com/quorum/tessera/test/ProcessManager.java | 2 +- .../tessera/test/vault/hashicorp/HashicorpStepDefs.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tessera-core/src/main/resources/tessera-core-spring.xml b/tessera-core/src/main/resources/tessera-core-spring.xml index 9e9e0c35b7..b05e47b136 100644 --- a/tessera-core/src/main/resources/tessera-core-spring.xml +++ b/tessera-core/src/main/resources/tessera-core-spring.xml @@ -145,7 +145,7 @@ - + diff --git a/tests/acceptance-test/src/test/java/admin/cmd/Utils.java b/tests/acceptance-test/src/test/java/admin/cmd/Utils.java index 08efec5150..9ecf6f1bdc 100644 --- a/tests/acceptance-test/src/test/java/admin/cmd/Utils.java +++ b/tests/acceptance-test/src/test/java/admin/cmd/Utils.java @@ -24,7 +24,7 @@ public static ExecutionResult start(Party party) throws IOException, Interrupted List args = Arrays.asList( "java", - "-Dspring.profiles.active=disable-unixsocket,disable-sync-poller", + "-Dspring.profiles.active=disable-unixsocket", "-Dnode.number=" + party.getAlias(), "-jar", jarPath, diff --git a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/ProcessManager.java b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/ProcessManager.java index 319c2611a8..6830f05c12 100644 --- a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/ProcessManager.java +++ b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/ProcessManager.java @@ -107,7 +107,7 @@ public void start(String nodeAlias) throws Exception { List args = Arrays.asList( "java", - "-Dspring.profiles.active=disable-unixsocket,disable-sync-poller", + "-Dspring.profiles.active=disable-unixsocket", "-Dnode.number=" + nodeAlias, "-Dlogback.configurationFile=" + logbackConfigFile.getFile(), "-Ddebug=true", diff --git a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/vault/hashicorp/HashicorpStepDefs.java b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/vault/hashicorp/HashicorpStepDefs.java index f583e3b443..3e882d1b3c 100644 --- a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/vault/hashicorp/HashicorpStepDefs.java +++ b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/vault/hashicorp/HashicorpStepDefs.java @@ -362,7 +362,7 @@ public HashicorpStepDefs() { args.addAll( Arrays.asList( "java", - "-Dspring.profiles.active=disable-unixsocket,disable-sync-poller", + "-Dspring.profiles.active=disable-unixsocket", "-Dlogback.configurationFile=" + logbackConfigFile.getFile(), "-Ddebug=true", "-jar", @@ -475,7 +475,7 @@ public HashicorpStepDefs() { args.addAll( Arrays.asList( "java", - "-Dspring.profiles.active=disable-unixsocket,disable-sync-poller", + "-Dspring.profiles.active=disable-unixsocket", "-Dlogback.configurationFile=" + logbackConfigFile.getFile(), "-Ddebug=true", "-jar",