summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendra@redhat.com>2014-06-16 19:08:18 +0530
committerVijay Bellur <vbellur@redhat.com>2014-06-20 03:34:24 -0700
commit9d2b7cd3e8161f557390b5b434464362a0ba7a16 (patch)
treee313407ccf7cc3cc7a83b66d8c8a2c2f09367235
parent78e9180ca24f15e1366eb3d51cbb5e4576af91a2 (diff)
tests: changes to some of the uss testcases
Made the below changes tests/basic/uss.t: removed the older way of getting the list of snapshots bugs/bug/bug-1109770.t: added uss disable test also to check snapd behavior Change-Id: I57b6bc8fa82bcaa544f483ad382e1bb4d11ef122 BUG: 1092850 Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-on: http://review.gluster.org/8081 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/basic/uss.t11
-rw-r--r--tests/bugs/bug-1109770.t4
2 files changed, 2 insertions, 13 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t
index 5f48ad2e9e5..23a6bf33125 100644
--- a/tests/basic/uss.t
+++ b/tests/basic/uss.t
@@ -42,14 +42,6 @@ for i in {11..20} ; do echo "foo" > $M0/dir2/foo$i ; done
TEST $CLI snapshot create snap4 $V0;
-UUIDS=$($CLI snapshot info | grep -i snap | grep -i Volume | grep -i Name | cut -d':' -f 2);
-
-echo $UUIDS > /tmp/tmp-snap-uuids;
-
-NAMES=$($CLI snapshot info | grep Snapshot | cut -d':' -f 2);
-
-echo $NAMES > /tmp/tmp-snap_names;
-
TEST $CLI volume set $V0 features.uss enable;
TEST umount $M0;
@@ -251,7 +243,4 @@ TEST fd_close $fd1;
TEST fd_close $fd2;
TEST fd_close $fd3;
-rm -f /tmp/tmp-snap-uuids;
-rm -f /tmp/tmp-snap_names;
-
cleanup;
diff --git a/tests/bugs/bug-1109770.t b/tests/bugs/bug-1109770.t
index 3ee43e3e304..139c1022e5b 100644
--- a/tests/bugs/bug-1109770.t
+++ b/tests/bugs/bug-1109770.t
@@ -48,13 +48,13 @@ SNAPD_PID=$(ps aux | grep snapd | grep -v grep | awk '{print $2}');
TEST [ $SNAPD_PID -gt 0 ];
-TEST $CLI volume stop $V0;
+TEST $CLI volume set $V0 features.uss disable;
SNAPD_PID=$(ps aux | grep snapd | grep -v grep | awk '{print $2}');
TEST ! [ $SNAPD_PID -gt 0 ];
-TEST $CLI volume start $V0;
+TEST $CLI volume set $V0 features.uss enable;
SNAPD_PID=$(ps aux | grep snapd | grep -v grep | awk '{print $2}');