opendev/gerrit
Code Issues Proposed changes

Fix failing integraion tests after merging SecureStore

Browse Source 
Change-Id: Ib4ec8ea2c39d67c58d7f30b134547bf8430ab466
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
This commit is contained in:
Dariusz Luksza 2014-09-11 13:01:01 +02:00
parent 59396a4818
commit 20517e1e53
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@ -40,6 +40,7 @@ import com.google.gerrit.pgm.util.ErrorLogFile;
import com.google.gerrit.pgm.util.GarbageCollectionLogFile;
import com.google.gerrit.pgm.util.LogFileCompressor;
import com.google.gerrit.pgm.util.RuntimeShutdown;
import com.google.gerrit.pgm.util.SecureStoreProvider;
import com.google.gerrit.pgm.util.SiteProgram;
import com.google.gerrit.reviewdb.client.AuthType;
import com.google.gerrit.server.account.InternalAccountDirectory;
@ -67,6 +68,7 @@ import com.google.gerrit.server.plugins.PluginGuiceEnvironment;
import com.google.gerrit.server.plugins.PluginRestApiModule;
import com.google.gerrit.server.schema.DataSourceProvider;
import com.google.gerrit.server.schema.SchemaVersionCheck;
import com.google.gerrit.server.securestore.SecureStore;
import com.google.gerrit.server.ssh.NoSshKeyCache;
import com.google.gerrit.server.ssh.NoSshModule;
import com.google.gerrit.server.ssh.SshAddressesModule;
@ -355,6 +357,9 @@ public class Daemon extends SiteProgram {
@Override
protected void configure() {
bind(GerritUiOptions.class).toInstance(new GerritUiOptions(headless));
if (test) {
bind(SecureStore.class).toProvider(SecureStoreProvider.class);
}
}
});
modules.add(GarbageCollectionRunner.module());

4
gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java
View File

@ -53,6 +53,8 @@ import com.google.gerrit.server.schema.Current;
import com.google.gerrit.server.schema.DataSourceType;
import com.google.gerrit.server.schema.SchemaCreator;
import com.google.gerrit.server.schema.SchemaVersion;
import com.google.gerrit.server.securestore.DefaultSecureStore;
import com.google.gerrit.server.securestore.SecureStore;
import com.google.gerrit.server.ssh.NoSshKeyCache;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
@ -149,6 +151,8 @@ public class InMemoryModule extends FactoryModule {
bind(new TypeLiteral<SchemaFactory<ReviewDb>>() {})
.to(InMemoryDatabase.class);
bind(SecureStore.class).to(DefaultSecureStore.class);
bind(ChangeHooks.class).to(DisabledChangeHooks.class);
install(NoSshKeyCache.module());
install(new CanonicalWebUrlModule() {