From a4c2df2ea0213731d82b835bdde63a7aab5b98fa Mon Sep 17 00:00:00 2001
From: Patrick Hiesel <hiesel@google.com>
Date: Thu, 22 Dec 2016 16:00:08 +0100
Subject: [PATCH] Enable Sshd only if we run ssh tests

Change-Id: I40e37d166540e6480a48de2b093c69a49d15c18a
---
 .../test/java/com/google/gerrit/acceptance/GerritServer.java | 2 ++
 gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
index 7b73505d0b..4b571321db 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
@@ -30,6 +30,7 @@ import com.google.gerrit.server.util.SystemLog;
 import com.google.gerrit.testutil.FakeEmailSender;
 import com.google.gerrit.testutil.NoteDbChecker;
 import com.google.gerrit.testutil.NoteDbMode;
+import com.google.gerrit.testutil.SshMode;
 import com.google.gerrit.testutil.TempFileUtil;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -136,6 +137,7 @@ public class GerritServer {
       }
     }, Paths.get(baseConfig.getString("gerrit", null, "tempSiteDir")));
     daemon.setEmailModuleForTesting(new FakeEmailSender.Module());
+    daemon.setEnableSshd(SshMode.useSsh());
 
     final File site;
     ExecutorService daemonService = null;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index a0ab7140aa..c024a67a6d 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -181,6 +181,11 @@ public class Daemon extends SiteProgram {
     this.serverStarted = serverStarted;
   }
 
+  @VisibleForTesting
+  public void setEnableSshd(boolean enable) {
+    sshd = enable;
+  }
+
   public void setEnableHttpd(boolean enable) {
     httpd = enable;
   }