motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix some tests for running in bazel"

This commit is contained in:
David Pursehouse 2017-08-31 22:02:21 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 37ea57701b c91c20f36f
commit 8abb47b296
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/CGitAttributesTest.java
View File

@ -125,11 +125,12 @@ private LinkedHashMap<String, Attributes> cgitAttributes(
ProcessBuilder builder = fs.runInShell("git",
new String[] { "check-attr", "--stdin", "--all" });
builder.directory(db.getWorkTree());
builder.environment().put("HOME", fs.userHome().getAbsolutePath());
ExecutionResult result = fs.execute(builder, new ByteArrayInputStream(
input.toString().getBytes(Constants.CHARSET)));
assertEquals("External git reported errors", "",
toString(result.getStderr()));
assertEquals("External git failed", 0, result.getRc());
String errorOut = toString(result.getStderr());
assertEquals("External git failed", "exit 0\n",
"exit " + result.getRc() + '\n' + errorOut);
LinkedHashMap<String, Attributes> map = new LinkedHashMap<>();
try (BufferedReader r = new BufferedReader(new InputStreamReader(
new BufferedInputStream(result.getStdout().openInputStream()),

7
org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/CGitIgnoreTest.java
View File

@ -105,11 +105,12 @@ private String[] cgitIgnored() throws Exception {
ProcessBuilder builder = fs.runInShell("git", new String[] { "ls-files",
"--ignored", "--exclude-standard", "-o" });
builder.directory(db.getWorkTree());
builder.environment().put("HOME", fs.userHome().getAbsolutePath());
ExecutionResult result = fs.execute(builder,
new ByteArrayInputStream(new byte[0]));
assertEquals("External git failed", 0, result.getRc());
assertEquals("External git reported errors", "",
toString(result.getStderr()));
String errorOut = toString(result.getStderr());
assertEquals("External git failed", "exit 0\n",
"exit " + result.getRc() + '\n' + errorOut);
try (BufferedReader r = new BufferedReader(new InputStreamReader(
new BufferedInputStream(result.getStdout().openInputStream()),
Constants.CHARSET))) {

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/indexdiff/IndexDiffWithSymlinkTest.java
View File

@ -142,7 +142,11 @@ private File restoreGitRepo(InputStream in, File testDir, String name)
String[] cmd = { "/bin/sh", "./" + name + ".sh" };
int exitCode;
String stdErr;
Process process = Runtime.getRuntime().exec(cmd, null, testDir);
ProcessBuilder builder = new ProcessBuilder(cmd);
builder.environment().put("HOME",
FS.DETECTED.userHome().getAbsolutePath());
builder.directory(testDir);
Process process = builder.start();
try (InputStream stdOutStream = process.getInputStream();
InputStream stdErrStream = process.getErrorStream();
OutputStream stdInStream = process.getOutputStream()) {