From 7dd0667d46bc32f9180a0bb381d1eef7cab2a947 Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Wed, 5 Aug 2015 15:56:53 +0530 Subject: snapshot: Fix snapshot info's xml output Backport of http://review.gluster.org/#/c/11834/ Display description field with (null) if no description is present for the snapshot, instead of removing the field altogether. Change-Id: I965b08cd6e54eea56c32e2712fab7daa8a663f11 BUG: 1250388 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/11918 Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Rajesh Joseph --- tests/bugs/snapshot/bug-1250387.t | 26 ++++++++++++++++++++++++++ tests/snapshot.rc | 14 ++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 tests/bugs/snapshot/bug-1250387.t (limited to 'tests') 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 f2ff047a8ea..42f1b5c65a6 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 -- cgit