diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/uss.t | 2 | ||||
| -rwxr-xr-x | tests/basic/volume-snapshot.t | 2 | ||||
| -rw-r--r-- | tests/bugs/bug-1109889.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/bug-1157991.t | 30 | ||||
| -rw-r--r-- | tests/include.rc | 2 | ||||
| -rwxr-xr-x | tests/snapshot.rc | 6 |
6 files changed, 42 insertions, 2 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t index 76c1deaf9ae..53a36cf4639 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -23,6 +23,8 @@ TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0; for i in {1..10} ; do echo "file" > $M0/file$i ; done +TEST $CLI snapshot config activate-on-create enable + TEST $CLI snapshot create snap1 $V0; for i in {11..20} ; do echo "file" > $M0/file$i ; done diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t index bb483850eeb..46440d1a706 100755 --- a/tests/basic/volume-snapshot.t +++ b/tests/basic/volume-snapshot.t @@ -86,6 +86,8 @@ start_volumes 2 EXPECT 'Started' volinfo_field $V0 'Status'; EXPECT 'Started' volinfo_field $V1 'Status'; +TEST $CLI_1 snapshot config activate-on-create enable + #Snapshot Operations create_snapshots diff --git a/tests/bugs/bug-1109889.t b/tests/bugs/bug-1109889.t index 2c2239fc57d..1f54338b840 100644 --- a/tests/bugs/bug-1109889.t +++ b/tests/bugs/bug-1109889.t @@ -25,6 +25,8 @@ MOUNT_PID=`ps ax |grep "glusterfs --volfile-sever $H0 --volfile-id=$V0 $M0" | gr for i in {1..10} ; do echo "file" > $M0/file$i ; done +TEST $CLI snapshot config activate-on-create enable + TEST $CLI snapshot create snap1 $V0; for i in {11..20} ; do echo "file" > $M0/file$i ; done diff --git a/tests/bugs/bug-1157991.t b/tests/bugs/bug-1157991.t new file mode 100755 index 00000000000..97d081052e8 --- /dev/null +++ b/tests/bugs/bug-1157991.t @@ -0,0 +1,30 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../snapshot.rc + +cleanup; +TEST verify_lvm_version; +TEST glusterd; +TEST pidof glusterd; + +TEST setup_lvm 1 + +TEST $CLI volume create $V0 $H0:$L1 +TEST $CLI volume start $V0 + +TEST $CLI snapshot create snap1 $V0 +EXPECT 'Stopped' snapshot_status snap1; + +TEST $CLI snapshot config activate-on-create enable +TEST $CLI snapshot create snap2 $V0 +EXPECT 'Started' snapshot_status snap2; + +#Clean up +TEST $CLI snapshot delete snap1 +TEST $CLI snapshot delete snap2 + +TEST $CLI volume stop $V0 force +TEST $CLI volume delete $V0 + +cleanup; diff --git a/tests/include.rc b/tests/include.rc index 572e68ac1ec..5640ab08fbe 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -1,6 +1,6 @@ M0=${M0:=/mnt/glusterfs/0}; # 0th mount point for FUSE M1=${M1:=/mnt/glusterfs/1}; # 1st mount point for FUSE -M2=${M1:=/mnt/glusterfs/2}; # 2nd mount point for FUSE +M2=${M2:=/mnt/glusterfs/2}; # 2nd mount point for FUSE N0=${N0:=/mnt/nfs/0}; # 0th mount point for NFS N1=${N1:=/mnt/nfs/1}; # 1st mount point for NFS V0=${V0:=patchy}; # volume name to use in tests diff --git a/tests/snapshot.rc b/tests/snapshot.rc index 3bdb79b764b..16549ec249f 100755 --- a/tests/snapshot.rc +++ b/tests/snapshot.rc @@ -291,11 +291,15 @@ function snapshot_n_exists() { function snapshot_status() { local snap=$1; + local cli=$CLI_1; + if [ "$cli" = "" ]; then + cli=$CLI + fi #TODO: Right now just fetches the status of the single snap volume. #When snapshot will have multiple snap volumes, should have a #cummulative logic for status - $CLI_1 snapshot info $snap | grep "Status" | sed 's/.*: //'; + $cli snapshot info $snap | grep "Status" | sed 's/.*: //'; } |