Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0DBD018432 for ; Sat, 22 Aug 2015 07:05:21 +0000 (UTC) Received: (qmail 57010 invoked by uid 500); 22 Aug 2015 07:05:21 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 56918 invoked by uid 500); 22 Aug 2015 07:05:20 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 56829 invoked by uid 99); 22 Aug 2015 07:05:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Aug 2015 07:05:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F485E0606; Sat, 22 Aug 2015 07:05:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbonofre@apache.org To: commits@karaf.apache.org Date: Sat, 22 Aug 2015 07:05:21 -0000 Message-Id: In-Reply-To: <6eb5312c72234cb89e26d44d83a292f9@git.apache.org> References: <6eb5312c72234cb89e26d44d83a292f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/11] karaf git commit: KARAF-3882: more of test bones. KARAF-3882: more of test bones. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a717ca6a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a717ca6a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a717ca6a Branch: refs/heads/master Commit: a717ca6a3cfd79bf078cc8944f30d4718de39df4 Parents: 434a175 Author: Benson Margulies Authored: Sun Jul 26 08:08:03 2015 -0400 Committer: Benson Margulies Committed: Sun Jul 26 08:08:03 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/karaf/itests/SshKeyFormatTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a717ca6a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java b/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java index 8b8cfc3..08c009a 100644 --- a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java @@ -23,6 +23,10 @@ package org.apache.karaf.itests; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; + /** * Test use of PEM keys. @@ -31,8 +35,12 @@ public class SshKeyFormatTest extends SshCommandTestBase { @Configuration public Option[] config() { - - + return options(composite(super.config()), + editConfigurationFilePut("org.apache.karaf.shell.cfg", "hostKey", "/etc/test.pem"), + editConfigurationFilePut("org.apache.karaf.shell.cfg", "hostKeyFormat", "PEM") + ); } + + }