summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-22 10:38:06 -0400
committerJames Moger <james.moger@gitblit.com>2014-04-10 18:58:09 -0400
commitbcc8a015ae552726742b4f437b2cb9e809270f96 (patch)
tree0ed21e1ca312121df8a4db01cb2c6bf0d125815f /src/test
parent5bed299423d4ba418c64732c51e567817a7f7e45 (diff)
downloadgitblit-bcc8a015ae552726742b4f437b2cb9e809270f96.tar.gz
gitblit-bcc8a015ae552726742b4f437b2cb9e809270f96.zip
Handle ssh keys as objects, not strings, and improve the ls and rm key commands
"gitblit keys ls" now defaults to showing an indexed list of fingerprints which almost matches the output of "sshadd -l". The indexes are useful specifying key(s) to remove using "gitblit keys rm <index>". This is an important improvement for key management.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/gitblit/tests/SshDaemonTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/java/com/gitblit/tests/SshDaemonTest.java b/src/test/java/com/gitblit/tests/SshDaemonTest.java
index 45d31c29..dbd1d868 100644
--- a/src/test/java/com/gitblit/tests/SshDaemonTest.java
+++ b/src/test/java/com/gitblit/tests/SshDaemonTest.java
@@ -35,6 +35,7 @@ import org.junit.Test;
import com.gitblit.Constants;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.MemoryKeyManager;
+import com.gitblit.transport.ssh.SshKey;
public class SshDaemonTest extends GitblitUnitTest {
@@ -66,7 +67,7 @@ public class SshDaemonTest extends GitblitUnitTest {
@Before
public void prepare() {
MemoryKeyManager keyMgr = getKeyManager();
- keyMgr.addKey("admin", pair.getPublic());
+ keyMgr.addKey("admin", new SshKey(pair.getPublic()));
}
@After