diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2015-08-05 15:56:53 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2015-08-24 00:03:03 -0700 |
| commit | 5044b20a9fbe0f49b7929d2282890a7351df344d (patch) | |
| tree | 899c1576a81359c232d5d7911655fab3e861a391 /tests | |
| parent | 6cb78f8b7444ad7f216c976700c28a7d59f6b976 (diff) | |
snapshot: Fix snapshot info's xml output
Display description field with (null) if
no description is present for the snapshot, instead
of removing the field altogether.
Change-Id: I965b08cd6e54eea56c32e2712fab7daa8a663f11
BUG: 1250387
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11834
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: mohammed rafi kc <rkavunga@redhat.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/bugs/snapshot/bug-1250387.t | 26 | ||||
| -rw-r--r-- | tests/snapshot.rc | 14 |
2 files changed, 40 insertions, 0 deletions
diff --git a/tests/bugs/snapshot/bug-1250387.t b/tests/bugs/snapshot/bug-1250387.t new file mode 100755 index 00000000000..c9039e37f73 --- /dev/null +++ b/tests/bugs/snapshot/bug-1250387.t @@ -0,0 +1,26 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc +. $(dirname $0)/../../snapshot.rc + +cleanup; + +TEST init_n_bricks 1; +TEST setup_lvm 1; + +TEST glusterd; + +TEST pidof glusterd; + +TEST $CLI volume create $V0 $H0:$L1; + +TEST $CLI volume start $V0; + +TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0; + +TEST $CLI snapshot create snap1 $V0 no-timestamp; + +EXPECT "description" get-cmd-field-xml "snapshot info snap1" "description" + +cleanup ; diff --git a/tests/snapshot.rc b/tests/snapshot.rc index 3ee1d6c4450..60e5b79ec76 100644 --- a/tests/snapshot.rc +++ b/tests/snapshot.rc @@ -431,6 +431,20 @@ function uss_count_snap_displayed() { ls $path/.snaps | wc -l } +#return specific fields of xml output +function get-cmd-field-xml() +{ + local cli=$CLI_1; + if [ "$cli" = "" ]; then + cli=$CLI + fi + + COMMAND=$1 + PATTERN=$2 + + $cli $COMMAND --xml | xmllint --format - | grep $PATTERN +} + case $OSTYPE in NetBSD) echo "Skip test on LVM which is not available on NetBSD" >&2 |