From 896b00d4ac8e4c710213e23636c8eee78026e440 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Tue, 10 Mar 2015 00:26:48 +0000 Subject: [PATCH] Add local repo config setting for travis. --- .../java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java index 25b71c617a..c5d47a1057 100644 --- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java +++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java @@ -326,6 +326,7 @@ public class WLGitBridgeIntegrationTest { File testprojDir = new File(dir, "testproj"); assertEquals(0, exitCode); assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/pushFailsOnFirstStageOutOfDate/state/testproj"), testprojDir.toPath())); + runtime.exec("git config push.default simple", null, testprojDir); runtime.exec("touch push.tex", null, testprojDir).waitFor(); runtime.exec("git add -A", null, testprojDir).waitFor(); runtime.exec("git commit -m \"push\"", null, testprojDir).waitFor(); @@ -360,6 +361,7 @@ public class WLGitBridgeIntegrationTest { File testprojDir = new File(dir, "testproj"); assertEquals(0, exitCode); assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/pushFailsOnSecondStageOutOfDate/state/testproj"), testprojDir.toPath())); + runtime.exec("git config push.default simple", null, testprojDir); runtime.exec("touch push.tex", null, testprojDir).waitFor(); runtime.exec("git add -A", null, testprojDir).waitFor(); runtime.exec("git commit -m \"push\"", null, testprojDir).waitFor();