diff options
| author | Sachin Pandit <spandit@redhat.com> | 2014-02-20 14:00:22 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2014-03-05 02:13:25 -0800 |
| commit | fabee8f75c56f18c949b79dcc751c2855b5c7514 (patch) | |
| tree | db78a64c7b49c6727a15171d8b894aa4e1992aab /tests | |
| parent | ae62c3aec7b92dc5325a04add9ab0ac63ff05fa5 (diff) | |
cli/snapshot : snapshot delete CLI changes.
Syntax:
gluster snapshot delete <snapname>
Change-Id: I5de7b9a79eeba12e4f0b8abfbe96a2db738f25c0
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/7144
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/volume-snapshot.t | 4 | ||||
| -rw-r--r-- | tests/bugs/bug-1040934.t | 2 | ||||
| -rw-r--r-- | tests/bugs/bug-1045333.t | 6 | ||||
| -rwxr-xr-x | tests/bugs/bug-1049834.t | 2 | ||||
| -rwxr-xr-x | tests/snapshot.rc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t index f6b88068e..4bc0792db 100755 --- a/tests/basic/volume-snapshot.t +++ b/tests/basic/volume-snapshot.t @@ -28,10 +28,10 @@ function create_snapshots() { } function delete_snapshots() { - $CLI_1 snapshot delete $V0 -s ${V0}_snap & + $CLI_1 snapshot delete ${V0}_snap & PID_1=$! - $CLI_1 snapshot delete $V1 -s ${V1}_snap & + $CLI_1 snapshot delete ${V1}_snap & PID_2=$! wait $PID_1 $PID_2 diff --git a/tests/bugs/bug-1040934.t b/tests/bugs/bug-1040934.t index 547f6c3bc..d057f0cb7 100644 --- a/tests/bugs/bug-1040934.t +++ b/tests/bugs/bug-1040934.t @@ -28,7 +28,7 @@ TEST mount -t glusterfs $H1:/snaps/${V0}_snap/$V0 $M0 cd $M0 TEST ! touch a -TEST $CLI_1 snapshot delete $V0 -s ${V0}_snap +TEST $CLI_1 snapshot delete ${V0}_snap PID_1=$! wait $PID_1 diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/bug-1045333.t index c1fd71beb..59ef1c5e7 100644 --- a/tests/bugs/bug-1045333.t +++ b/tests/bugs/bug-1045333.t @@ -38,9 +38,9 @@ TEST mount -t glusterfs $H0:/snaps/$S3/$V0 $M0 TEST umount -f $M0 #Clean up -TEST $CLI snapshot delete $V0 -s $S1 -TEST $CLI snapshot delete $V0 -s $S2 -TEST $CLI snapshot delete $V0 -s $S3 +TEST $CLI snapshot delete $S1 +TEST $CLI snapshot delete $S2 +TEST $CLI snapshot delete $S3 TEST $CLI volume stop $V0 force TEST $CLI volume delete $V0 diff --git a/tests/bugs/bug-1049834.t b/tests/bugs/bug-1049834.t index ea4b3c85d..6587fb765 100755 --- a/tests/bugs/bug-1049834.t +++ b/tests/bugs/bug-1049834.t @@ -31,7 +31,7 @@ TEST snapshot_n_exists $V0 4 $V0_snap #Creating the 5th snapshots on the volume and expecting it not to be created. TEST ! $CLI_1 snapshot create $V0 -n ${V0}_snap5 TEST ! snapshot_exists ${V0}_snap5 -TEST ! $CLI_1 snapshot delete $V0 -s ${V0}_snap5 +TEST ! $CLI_1 snapshot delete ${V0}_snap5 #Deleting the 4 snaps TEST delete_n_snapshots $V0 4 $V0_snap diff --git a/tests/snapshot.rc b/tests/snapshot.rc index 230f62a68..52481b0fb 100755 --- a/tests/snapshot.rc +++ b/tests/snapshot.rc @@ -172,7 +172,7 @@ function _remove_vhd() { ######################################################## function snapshot_exists() { local snapname=$1 - $CLI snapshot list | egrep -q "\s$snapname\b" + $CLI snapshot list | egrep -q "^$snapname\$" return $? } @@ -214,7 +214,7 @@ function delete_n_snapshots() { local snap_name=$3 local ret=0 for i in `seq 1 $snap_count`; do - $CLI_1 snapshot delete ${vol} -s $snap_name$i & + $CLI_1 snapshot delete $snap_name$i & PID_1=$! wait $PID_1 temp=$? |