From 5044b20a9fbe0f49b7929d2282890a7351df344d 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 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 Reviewed-on: http://review.gluster.org/11834 Tested-by: NetBSD Build System Reviewed-by: mohammed rafi kc Reviewed-by: Rajesh Joseph --- tests/snapshot.rc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/snapshot.rc') 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 -- cgit