opendev/gerrit
Code Issues Proposed changes

Update to JGit 0.8.4.240-g8e9cc82

Browse Source 
Change-Id: Id43a1846b31bb1aad40ca0ae295a268fcacd162f
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-08-05 17:57:35 -07:00
parent 91c1532130
commit 5f11b2954c
26 changed files with 255 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/InitTestCase.java
View File

@@ -21,6 +21,6 @@ import java.io.IOException;
public abstract class InitTestCase extends LocalDiskRepositoryTestCase {
protected File newSitePath() throws IOException {
return new File(createWorkRepository().getWorkDir(), "test_site");
return new File(createWorkRepository().getWorkTree(), "test_site");
}
}

11
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
View File

@@ -24,7 +24,8 @@ import com.google.gerrit.pgm.util.ConsoleUI;
import com.google.gerrit.server.config.SitePaths;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.FileBasedConfig;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.IO;
import java.io.File;
@@ -50,7 +51,9 @@ public class UpgradeFrom2_0_xTest extends InitTestCase {
}
}
FileBasedConfig old = new FileBasedConfig(new File(p, "gerrit.config"));
FileBasedConfig old =
new FileBasedConfig(new File(p, "gerrit.config"), FS.DETECTED);
old.setString("ldap", null, "username", "ldap.user");
old.setString("ldap", null, "password", "ldap.s3kr3t");
@@ -84,8 +87,8 @@ public class UpgradeFrom2_0_xTest extends InitTestCase {
new String(IO.readFully(new File(site.etc_dir, n)), "UTF-8"));
}
FileBasedConfig cfg = new FileBasedConfig(site.gerrit_config);
FileBasedConfig sec = new FileBasedConfig(site.secure_config);
FileBasedConfig cfg = new FileBasedConfig(site.gerrit_config, FS.DETECTED);
FileBasedConfig sec = new FileBasedConfig(site.secure_config, FS.DETECTED);
cfg.load();
sec.load();