opendev/gerrit
Code Issues Proposed changes

Unset userHome in FS.

Browse Source 
This prevents arbitrary user settings state from leaking into our
tests.

Change-Id: If5f4230bfaede0bf9f688b2cf1a1a48de5740b55
This commit is contained in:
Han-Wen Nienhuys
2016-02-09 18:10:11 +01:00
parent c34413b44b
commit 5e9578bdc3
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java
View File

@@ -42,6 +42,7 @@ import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@@ -103,12 +104,18 @@ public class GitUtil {
Project.NameKey project, String uri) throws Exception { Project.NameKey project, String uri) throws Exception {
DfsRepositoryDescription desc = DfsRepositoryDescription desc =
new DfsRepositoryDescription("clone of " + project.get()); new DfsRepositoryDescription("clone of " + project.get());
FS fs = FS.detect();
// Avoid leaking user state into our tests.
fs.setUserHome(null);
InMemoryRepository dest = new InMemoryRepository.Builder() InMemoryRepository dest = new InMemoryRepository.Builder()
.setRepositoryDescription(desc) .setRepositoryDescription(desc)
// SshTransport depends on a real FS to read ~/.ssh/config, but // SshTransport depends on a real FS to read ~/.ssh/config, but
// InMemoryRepository by default uses a null FS. // InMemoryRepository by default uses a null FS.
// TODO(dborowitz): Remove when we no longer depend on SSH. // TODO(dborowitz): Remove when we no longer depend on SSH.
.setFS(FS.detect()) .setFS(fs)
.build(); .build();
Config cfg = dest.getConfig(); Config cfg = dest.getConfig();
cfg.setString("remote", "origin", "url", uri); cfg.setString("remote", "origin", "url", uri);