Patchwork [v5,3/3] iotests: Add 'check -ssh' option to test Secure Shell block device.

login
register
mail settings
Submitter Richard W.M. Jones
Date April 3, 2013, 10:17 p.m.
Message ID <1365027461-8884-4-git-send-email-rjones@redhat.com>
Download mbox | patch
Permalink /patch/233593/
State New
Headers show

Comments

Richard W.M. Jones - April 3, 2013, 10:17 p.m.
From: "Richard W.M. Jones" <rjones@redhat.com>

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
 tests/qemu-iotests/common    | 5 +++++
 tests/qemu-iotests/common.rc | 3 +++
 2 files changed, 8 insertions(+)
Richard W.M. Jones - April 3, 2013, 10:25 p.m.
On Wed, Apr 03, 2013 at 11:17:41PM +0100, Richard W.M. Jones wrote:
> From: "Richard W.M. Jones" <rjones@redhat.com>
> 
> Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
> ---
>  tests/qemu-iotests/common    | 5 +++++
>  tests/qemu-iotests/common.rc | 3 +++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
> index b3aad89..6826ea7 100644
> --- a/tests/qemu-iotests/common
> +++ b/tests/qemu-iotests/common
> @@ -137,6 +137,7 @@ check options
>      -rbd                test rbd
>      -sheepdog           test sheepdog
>      -nbd                test nbd
> +    -ssh                test ssh
>      -xdiff		graphical mode diff
>      -nocache		use O_DIRECT on backing file
>      -misalign		misalign memory allocations
> @@ -206,6 +207,10 @@ testlist options
>  	    IMGPROTO=nbd
>  	    xpand=false
>  	    ;;
> +        -ssh)
> +            IMGPROTO=ssh
> +            xpand=false
> +            ;;
>  	-nocache)
>  	    QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache"
>  	    xpand=false
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index e522d61..a536bf7 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -52,6 +52,9 @@ if [ "$IMGPROTO" = "file" ]; then
>  elif [ "$IMGPROTO" = "nbd" ]; then
>      TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
>      TEST_IMG="nbd:127.0.0.1:10810"
> +elif [ "$IMGPROTO" = "ssh" ]; then
> +    TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> +    TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
>  else
>      TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
>  fi

A note about this commit:

It assumes that you (a) have an ssh server running on localhost
(rather than trying to start one up), and (b) that you have the key
for localhost in your known_hosts file, and (c) that your ssh-agent
allows you to log in to localhost without a password (ie. copy
.ssh/id_rsa.pub to .ssh/authorized_keys).

Once, before you run the tests, you have to do 'ssh localhost'.

Rich.

Patch

diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index b3aad89..6826ea7 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -137,6 +137,7 @@  check options
     -rbd                test rbd
     -sheepdog           test sheepdog
     -nbd                test nbd
+    -ssh                test ssh
     -xdiff		graphical mode diff
     -nocache		use O_DIRECT on backing file
     -misalign		misalign memory allocations
@@ -206,6 +207,10 @@  testlist options
 	    IMGPROTO=nbd
 	    xpand=false
 	    ;;
+        -ssh)
+            IMGPROTO=ssh
+            xpand=false
+            ;;
 	-nocache)
 	    QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache"
 	    xpand=false
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index e522d61..a536bf7 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -52,6 +52,9 @@  if [ "$IMGPROTO" = "file" ]; then
 elif [ "$IMGPROTO" = "nbd" ]; then
     TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
     TEST_IMG="nbd:127.0.0.1:10810"
+elif [ "$IMGPROTO" = "ssh" ]; then
+    TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+    TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
 else
     TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
 fi