From 288bde3f9e925e6e7b1629c15fcb186269f1cb06 Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 28 Jun 2012 18:37:40 -0700
Subject: [PATCH] qa: restructure rbd cli tests

Move tests into functions and remove all images at the end of each.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---
 qa/workunits/rbd/copy.sh | 130 +++++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 60 deletions(-)

diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh
index 35bcf3b5c7bc8..dd54e6b155ee6 100755
--- a/qa/workunits/rbd/copy.sh
+++ b/qa/workunits/rbd/copy.sh
@@ -1,63 +1,73 @@
 #!/bin/sh -ex
 
-TMP_FILES="/tmp/img1 /tmp/img1.new /tmp/img2 /tmp/img2.new /tmp/img3 /tmp/img3.new /tmp/img1.snap1"
-
-rbd snap purge testimg1 || true
-rbd rm testimg1 || true
-rbd rm testimg2 || true
-rbd rm testimg3 || true
-
-rm -f $TMP_FILES
-
-# create an image
-dd if=/bin/sh of=/tmp/img1 bs=1k count=1 seek=10
-dd if=/bin/dd of=/tmp/img1 bs=1k count=10 seek=100
-dd if=/bin/rm of=/tmp/img1 bs=1k count=100 seek=1000
-dd if=/bin/ls of=/tmp/img1 bs=1k seek=10000
-dd if=/bin/ln of=/tmp/img1 bs=1k seek=100000
-
-# import, snapshot
-rbd import $RBD_CREATE_ARGS /tmp/img1 testimg1
-rbd resize testimg1 --size=256
-rbd export testimg1 /tmp/img2
-rbd snap create testimg1 --snap=snap1
-rbd resize testimg1 --size=128
-rbd export testimg1 /tmp/img3
-
-# info
-rbd info testimg1 | grep 'size 128 MB'
-rbd info --snap=snap1 testimg1 | grep 'size 256 MB'
-
-# make copies
-rbd copy testimg1 --snap=snap1 testimg2
-rbd copy testimg1 testimg3
-
-# verify the result
-rbd info testimg2 | grep 'size 256 MB'
-rbd info testimg3 | grep 'size 128 MB'
-
-rbd export testimg1 /tmp/img1.new
-rbd export testimg2 /tmp/img2.new
-rbd export testimg3 /tmp/img3.new
-
-cmp /tmp/img2 /tmp/img2.new
-cmp /tmp/img3 /tmp/img3.new
-
-# rollback
-rbd snap rollback --snap=snap1 testimg1
-rbd info testimg1 | grep 'size 256 MB'
-rbd export testimg1 /tmp/img1.snap1
-cmp /tmp/img2 /tmp/img1.snap1
-
-# remove snapshots
-rbd snap rm --snap=snap1 testimg1
-rbd info --snap=snap1 testimg1 2>&1 | grep 'error setting snapshot context: (2) No such file or directory'
+IMGS="testimg1 testimg2 testimg3 foo foo2 bar bar2 test1 test2 test3"
+
+remove_images() {
+    for img in $IMGS
+    do
+        rbd snap purge $img || true
+        rbd rm $img || true
+    done
+}
+
+test_others() {
+    echo "testing import, export, resize, and snapshots..."
+    TMP_FILES="/tmp/img1 /tmp/img1.new /tmp/img2 /tmp/img2.new /tmp/img3 /tmp/img3.new /tmp/img1.snap1"
+
+    remove_images
+    rm -f $TMP_FILES
+
+    # create an image
+    dd if=/bin/sh of=/tmp/img1 bs=1k count=1 seek=10
+    dd if=/bin/dd of=/tmp/img1 bs=1k count=10 seek=100
+    dd if=/bin/rm of=/tmp/img1 bs=1k count=100 seek=1000
+    dd if=/bin/ls of=/tmp/img1 bs=1k seek=10000
+    dd if=/bin/ln of=/tmp/img1 bs=1k seek=100000
+
+    # import, snapshot
+    rbd import $RBD_CREATE_ARGS /tmp/img1 testimg1
+    rbd resize testimg1 --size=256
+    rbd export testimg1 /tmp/img2
+    rbd snap create testimg1 --snap=snap1
+    rbd resize testimg1 --size=128
+    rbd export testimg1 /tmp/img3
+
+    # info
+    rbd info testimg1 | grep 'size 128 MB'
+    rbd info --snap=snap1 testimg1 | grep 'size 256 MB'
+
+    # make copies
+    rbd copy testimg1 --snap=snap1 testimg2
+    rbd copy testimg1 testimg3
+
+    # verify the result
+    rbd info testimg2 | grep 'size 256 MB'
+    rbd info testimg3 | grep 'size 128 MB'
+
+    rbd export testimg1 /tmp/img1.new
+    rbd export testimg2 /tmp/img2.new
+    rbd export testimg3 /tmp/img3.new
+
+    cmp /tmp/img2 /tmp/img2.new
+    cmp /tmp/img3 /tmp/img3.new
+
+    # rollback
+    rbd snap rollback --snap=snap1 testimg1
+    rbd info testimg1 | grep 'size 256 MB'
+    rbd export testimg1 /tmp/img1.snap1
+    cmp /tmp/img2 /tmp/img1.snap1
+
+    # remove snapshots
+    rbd snap rm --snap=snap1 testimg1
+    rbd info --snap=snap1 testimg1 2>&1 | grep 'error setting snapshot context: (2) No such file or directory'
+
+    remove_images
+    rm -f $TMP_FILES
+}
 
 test_rename() {
-    rbd rm foo || true
-    rbd rm bar || true
-    rbd rm foo2 || true
-    rbd rm bar2 || true
+    echo "testing rename..."
+    remove_images
 
     rbd create -s 1 foo
     rbd create --new-format -s 1 bar
@@ -65,12 +75,12 @@ test_rename() {
     rbd rename foo2 bar 2>&1 | grep exists
     rbd rename bar bar2
     rbd rename bar2 foo2 2>&1 | grep exists
-    rbd rm foo2
-    rbd rm bar2
+
+    remove_images
 }
 
-test_rename
 
-rm -f $TMP_FILES
+test_rename
+test_others
 
 echo OK
-- 
2.39.5