From f79ca8814ec2435e8c80b0fa595d8866eca6b26d Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Fri, 26 Oct 2018 06:03:10 +1000 Subject: [PATCH] Don't display the default data directory in --help output because if it is too long, it causes Picocli to enter an infinite loop. (#148) --- .../main/java/tech/pegasys/pantheon/cli/PantheonCommand.java | 2 +- .../java/tech/pegasys/pantheon/cli/PantheonCommandTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java index 2eaa8b569f..e76bfa8d2a 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java @@ -142,7 +142,7 @@ public class PantheonCommand implements Runnable { @Option( names = {"--datadir"}, paramLabel = MANDATORY_PATH_FORMAT_HELP, - description = "the path to Pantheon data directory (default: ${DEFAULT-VALUE})" + description = "the path to Pantheon data directory" ) private final Path dataDir = getDefaultPantheonDataDir(); diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java index 35002bbff2..8acf33d587 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java @@ -60,7 +60,6 @@ import org.junit.rules.TemporaryFolder; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; -@Ignore("temporarily ignored because tests hang if working dir path too long") public class PantheonCommandTest extends CommandTestAbstract { @Rule public final TemporaryFolder temp = new TemporaryFolder();