github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Make submodule test more verbose

Browse source
This commit is contained in:
Winston Li 2017-01-04 22:35:48 +00:00
parent e498dd3a2a
commit af49325b88
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java
View file

@ -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<String> 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();
}