aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJukka Jokiniva <jukka.jokiniva@qt.io>2019-01-04 12:55:17 +0200
committerJukka Jokiniva <jukka.jokiniva@qt.io>2019-01-11 06:08:20 +0000
commitb793cd0db4164d0ea390eae68e1e4af1d42e53c5 (patch)
treef73f0a68530d55888cda2dcb8cf4397386e5e4da
parent5a99d4343201c361e93071469fdc65b3ec43355e (diff)
Add ssh command to ping the plugin
Fixes: QTBI-1544 Change-Id: Ie9ad33b5873a133665dda21ece3f80d0e552b5da Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java20
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java2
-rw-r--r--src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java8
3 files changed, 26 insertions, 4 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java
new file mode 100644
index 0000000..6d9dea0
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java
@@ -0,0 +1,20 @@
+//
+// Copyright (C) 2018 The Qt Company
+//
+
+package com.googlesource.gerrit.plugins.qtcodereview;
+
+import com.google.gerrit.sshd.SshCommand;
+import com.google.gerrit.sshd.CommandMetaData;
+
+@CommandMetaData(name="ping", description="Ping the SSH Command interface")
+class QtCommandPing extends SshCommand {
+ @Override
+ protected void run() {
+ stdout.print(String.format("Pong\n username=%s\n name=%s\n email=%s\n",
+ user.asIdentifiedUser().getUserName(),
+ user.asIdentifiedUser().getName(),
+ user.asIdentifiedUser().getNameEmail()));
+ }
+}
+
diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java
index 3dbf1d4..ca7c940 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java
@@ -10,6 +10,6 @@ class QtSshModule extends PluginCommandModule {
@Override
protected void configureCommands() {
-
+ command(QtCommandPing.class);
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java
index fd0d42a..965f6d2 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java
@@ -8,7 +8,7 @@ import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.TestPlugin;
-
+import com.google.gerrit.acceptance.UseSsh;
import com.google.gerrit.reviewdb.client.Change;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -22,6 +22,7 @@ import org.junit.Test;
sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule"
)
+@UseSsh
public class QtCodeReviewIT extends LightweightPluginDaemonTest {
protected static final String R_HEADS = "refs/heads/";
@@ -29,8 +30,9 @@ public class QtCodeReviewIT extends LightweightPluginDaemonTest {
protected static final String R_PUSH = "refs/for/";
@Test
- public void dummyTest() {
-
+ public void pingSSHTest() throws Exception {
+ assertThat(adminSshSession.exec("gerrit-plugin-qt-workflow ping")).contains("Pong");
+ assertThat(adminSshSession.getError()).isNull();
}