opendev/gerrit
Code Issues Proposed changes

Enable Sshd only if we run ssh tests

Browse Source 
Change-Id: I40e37d166540e6480a48de2b093c69a49d15c18a
This commit is contained in:
Patrick Hiesel
2016-12-22 16:00:08 +01:00
parent 9edf8e5c7c
commit a4c2df2ea0
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
View File

@@ -30,6 +30,7 @@ import com.google.gerrit.server.util.SystemLog;
import com.google.gerrit.testutil.FakeEmailSender; import com.google.gerrit.testutil.FakeEmailSender;
import com.google.gerrit.testutil.NoteDbChecker; import com.google.gerrit.testutil.NoteDbChecker;
import com.google.gerrit.testutil.NoteDbMode; import com.google.gerrit.testutil.NoteDbMode;
import com.google.gerrit.testutil.SshMode;
import com.google.gerrit.testutil.TempFileUtil; import com.google.gerrit.testutil.TempFileUtil;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Key; import com.google.inject.Key;
@@ -136,6 +137,7 @@ public class GerritServer {
} }
}, Paths.get(baseConfig.getString("gerrit", null, "tempSiteDir"))); }, Paths.get(baseConfig.getString("gerrit", null, "tempSiteDir")));
daemon.setEmailModuleForTesting(new FakeEmailSender.Module()); daemon.setEmailModuleForTesting(new FakeEmailSender.Module());
daemon.setEnableSshd(SshMode.useSsh());
final File site; final File site;
ExecutorService daemonService = null; ExecutorService daemonService = null;

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

@@ -181,6 +181,11 @@ public class Daemon extends SiteProgram {
this.serverStarted = serverStarted; this.serverStarted = serverStarted;
} }
@VisibleForTesting
public void setEnableSshd(boolean enable) {
sshd = enable;
}
public void setEnableHttpd(boolean enable) { public void setEnableHttpd(boolean enable) {
httpd = enable; httpd = enable;
} }