Merge branch 'stable-3.1'
* stable-3.1: Bazel: Remove suppression of JSC_UNUSED_LOCAL_ASSIGNMENT Bazel: Remove suppression of JSC_REFERENCE_BEFORE_DECLARE AbstractDaemonTest: use fake SystemReader StandaloneSiteTest: Ignore jgit config Change-Id: I78d937230125fc6f3a13aede94e137299ac56c42
This commit is contained in:
commit
9706a78a4e
@ -124,6 +124,7 @@ import com.google.gerrit.server.query.change.ChangeData;
|
|||||||
import com.google.gerrit.server.query.change.InternalChangeQuery;
|
import com.google.gerrit.server.query.change.InternalChangeQuery;
|
||||||
import com.google.gerrit.server.restapi.change.Revisions;
|
import com.google.gerrit.server.restapi.change.Revisions;
|
||||||
import com.google.gerrit.server.update.BatchUpdate;
|
import com.google.gerrit.server.update.BatchUpdate;
|
||||||
|
import com.google.gerrit.server.util.git.DelegateSystemReader;
|
||||||
import com.google.gerrit.testing.ConfigSuite;
|
import com.google.gerrit.testing.ConfigSuite;
|
||||||
import com.google.gerrit.testing.FakeEmailSender;
|
import com.google.gerrit.testing.FakeEmailSender;
|
||||||
import com.google.gerrit.testing.FakeEmailSender.Message;
|
import com.google.gerrit.testing.FakeEmailSender.Message;
|
||||||
@ -135,6 +136,7 @@ import com.google.inject.Module;
|
|||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
import com.jcraft.jsch.KeyPair;
|
import com.jcraft.jsch.KeyPair;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
@ -170,11 +172,14 @@ import org.eclipse.jgit.revwalk.RevCommit;
|
|||||||
import org.eclipse.jgit.revwalk.RevSort;
|
import org.eclipse.jgit.revwalk.RevSort;
|
||||||
import org.eclipse.jgit.revwalk.RevTree;
|
import org.eclipse.jgit.revwalk.RevTree;
|
||||||
import org.eclipse.jgit.revwalk.RevWalk;
|
import org.eclipse.jgit.revwalk.RevWalk;
|
||||||
|
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
||||||
import org.eclipse.jgit.transport.FetchResult;
|
import org.eclipse.jgit.transport.FetchResult;
|
||||||
import org.eclipse.jgit.transport.RefSpec;
|
import org.eclipse.jgit.transport.RefSpec;
|
||||||
import org.eclipse.jgit.transport.Transport;
|
import org.eclipse.jgit.transport.Transport;
|
||||||
import org.eclipse.jgit.transport.TransportBundleStream;
|
import org.eclipse.jgit.transport.TransportBundleStream;
|
||||||
import org.eclipse.jgit.transport.URIish;
|
import org.eclipse.jgit.transport.URIish;
|
||||||
|
import org.eclipse.jgit.util.FS;
|
||||||
|
import org.eclipse.jgit.util.SystemReader;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.AfterClass;
|
import org.junit.AfterClass;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
@ -289,6 +294,7 @@ public abstract class AbstractDaemonTest {
|
|||||||
private ProjectResetter resetter;
|
private ProjectResetter resetter;
|
||||||
private List<Repository> toClose;
|
private List<Repository> toClose;
|
||||||
private String systemTimeZone;
|
private String systemTimeZone;
|
||||||
|
private SystemReader oldSystemReader;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void clearSender() {
|
public void clearSender() {
|
||||||
@ -385,6 +391,10 @@ public abstract class AbstractDaemonTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void beforeTest(Description description) throws Exception {
|
protected void beforeTest(Description description) throws Exception {
|
||||||
|
// SystemReader must be overridden before creating any repos, since they read the user/system
|
||||||
|
// configs at initialization time, and are then stored in the RepositoryCache forever.
|
||||||
|
oldSystemReader = setFakeSystemReader(temporaryFolder.getRoot());
|
||||||
|
|
||||||
this.description = description;
|
this.description = description;
|
||||||
GerritServer.Description classDesc =
|
GerritServer.Description classDesc =
|
||||||
GerritServer.Description.forTestClass(description, configName);
|
GerritServer.Description.forTestClass(description, configName);
|
||||||
@ -447,6 +457,28 @@ public abstract class AbstractDaemonTest {
|
|||||||
methodDesc.useSystemTime(), methodDesc.useClockStep(), methodDesc.useTimezone());
|
methodDesc.useSystemTime(), methodDesc.useClockStep(), methodDesc.useTimezone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static SystemReader setFakeSystemReader(File tempDir) {
|
||||||
|
SystemReader oldSystemReader = SystemReader.getInstance();
|
||||||
|
SystemReader.setInstance(
|
||||||
|
new DelegateSystemReader(oldSystemReader) {
|
||||||
|
@Override
|
||||||
|
public FileBasedConfig openJGitConfig(Config parent, FS fs) {
|
||||||
|
return new FileBasedConfig(parent, new File(tempDir, "jgit.config"), FS.detect());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FileBasedConfig openUserConfig(Config parent, FS fs) {
|
||||||
|
return new FileBasedConfig(parent, new File(tempDir, "user.config"), FS.detect());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FileBasedConfig openSystemConfig(Config parent, FS fs) {
|
||||||
|
return new FileBasedConfig(parent, new File(tempDir, "system.config"), FS.detect());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return oldSystemReader;
|
||||||
|
}
|
||||||
|
|
||||||
private void setTimeSettings(
|
private void setTimeSettings(
|
||||||
boolean useSystemTime,
|
boolean useSystemTime,
|
||||||
@Nullable UseClockStep useClockStep,
|
@Nullable UseClockStep useClockStep,
|
||||||
@ -602,6 +634,8 @@ public abstract class AbstractDaemonTest {
|
|||||||
server.close();
|
server.close();
|
||||||
server = null;
|
server = null;
|
||||||
}
|
}
|
||||||
|
SystemReader.setInstance(oldSystemReader);
|
||||||
|
oldSystemReader = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void closeSsh() {
|
protected void closeSsh() {
|
||||||
|
@ -143,6 +143,11 @@ public abstract class StandaloneSiteTest {
|
|||||||
SystemReader oldSystemReader = SystemReader.getInstance();
|
SystemReader oldSystemReader = SystemReader.getInstance();
|
||||||
SystemReader.setInstance(
|
SystemReader.setInstance(
|
||||||
new DelegateSystemReader(oldSystemReader) {
|
new DelegateSystemReader(oldSystemReader) {
|
||||||
|
@Override
|
||||||
|
public FileBasedConfig openJGitConfig(Config parent, FS fs) {
|
||||||
|
return new FileBasedConfig(parent, new File(tempDir, "jgit.config"), FS.detect());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public FileBasedConfig openUserConfig(Config parent, FS fs) {
|
public FileBasedConfig openUserConfig(Config parent, FS fs) {
|
||||||
return new FileBasedConfig(parent, new File(tempDir, "user.config"), FS.detect());
|
return new FileBasedConfig(parent, new File(tempDir, "user.config"), FS.detect());
|
||||||
|
@ -22,8 +22,6 @@ def polygerrit_bundle(name, srcs, outs, app):
|
|||||||
dependency_mode = "PRUNE_LEGACY",
|
dependency_mode = "PRUNE_LEGACY",
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO(davido): Remove JSC_REFERENCE_BEFORE_DECLARE when this is fixed upstream:
|
|
||||||
# https://github.com/Polymer/polymer-resin/issues/7
|
|
||||||
closure_js_library(
|
closure_js_library(
|
||||||
name = name + "_closure_lib",
|
name = name + "_closure_lib",
|
||||||
srcs = [appName + ".js"],
|
srcs = [appName + ".js"],
|
||||||
@ -32,9 +30,7 @@ def polygerrit_bundle(name, srcs, outs, app):
|
|||||||
# and remove this supression
|
# and remove this supression
|
||||||
suppress = [
|
suppress = [
|
||||||
"JSC_JSDOC_MISSING_TYPE_WARNING",
|
"JSC_JSDOC_MISSING_TYPE_WARNING",
|
||||||
"JSC_REFERENCE_BEFORE_DECLARE",
|
|
||||||
"JSC_UNNECESSARY_ESCAPE",
|
"JSC_UNNECESSARY_ESCAPE",
|
||||||
"JSC_UNUSED_LOCAL_ASSIGNMENT",
|
|
||||||
],
|
],
|
||||||
deps = [
|
deps = [
|
||||||
"//lib/polymer_externs:polymer_closure",
|
"//lib/polymer_externs:polymer_closure",
|
||||||
|
Loading…
Reference in New Issue
Block a user