From af49325b8880862b4fb92494fdc445a7f8a364cf Mon Sep 17 00:00:00 2001 From: Winston Li Date: Wed, 4 Jan 2017 22:35:48 +0000 Subject: [PATCH] Make submodule test more verbose --- .../WLGitBridgeIntegrationTest.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java index 2b630a3d01..561c0f9ba2 100644 --- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java +++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java @@ -655,12 +655,26 @@ public class WLGitBridgeIntegrationTest { runtime.exec("git commit -m \"sub\"", null, sub).waitFor(); runtime.exec("git add -A", null, testprojDir).waitFor(); runtime.exec("git commit -m \"push\"", null, testprojDir).waitFor(); - Process gitPush = runtime.exec("git push", null, testprojDir); + Process gitPush = runtime.exec("git push -v --progress", null, testprojDir); int pushExitCode = gitPush.waitFor(); wlgb.stop(); + /* TODO: remove this entire conditional, remove -v and --progress flags (:658), remove subList call (:676) */ + if (pushExitCode != 1) { + String stdout = IOUtils.toString(gitPush.getInputStream(), StandardCharsets.UTF_8); + String stderr = IOUtils.toString(gitPush.getErrorStream(), StandardCharsets.UTF_8); + /* Print to stderr to avoid log config */ + System.err.println("===== Git exit code was not 1, it was: " + pushExitCode + " ====="); + System.err.println("===== Failing test ====="); + System.err.println("===== stdout (" + stdout.length() + " chars) ====="); + System.err.println(stdout); + System.err.println("===== stderr: (" + stderr.length() + " chars) ====="); + System.err.println(stderr); + fail(); + return; + } assertEquals(1, pushExitCode); List actual = Util.linesFromStream(gitPush.getErrorStream(), 2, "[K"); - assertEquals(EXPECTED_OUT_PUSH_SUBMODULE, actual); + assertEquals(EXPECTED_OUT_PUSH_SUBMODULE, actual.subList(actual.size() - 6, actual.size())); wlgb.stop(); }