master - tests: api updates
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c613fa48ffc0b4b89be...
Commit: c613fa48ffc0b4b89beedb93612270b29cc41fb9
Parent: 3d90c7fffc3c7e5fa0a02d829909c204fa0d6bfb
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 21:51:26 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: api updates
---
test/api/dbustest.sh | 6 ++++--
test/api/pytest.sh | 10 ++++++----
test/api/vglist.sh | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index 681e399..5817e01 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -25,7 +25,9 @@ cp -v "$TESTOLDPWD/lib/lvmdbusd.profile" "$TESTDIR/etc/profile/"
# Need to set this up so that the lvmdbusd service knows which
# binary to be running, which should be the one we just built
-export LVM_BINARY=$(which lvm 2>/dev/null)
+LVM_BINARY=$(which lvm 2>/dev/null)
+export LVM_BINARY
+
# skip if we don't have our own lvmetad...
if test -z "${installed_testsuite+varset}"; then
(echo "$LVM_BINARY" | grep -q "$abs_builddir") || skip
@@ -33,4 +35,4 @@ fi
aux prepare_lvmdbusd
-$TESTOLDPWD/dbus/lvmdbustest.py -v
+"$TESTOLDPWD/dbus/lvmdbustest.py" -v
diff --git a/test/api/pytest.sh b/test/api/pytest.sh
index 28a1cd0..e4e0994 100644
--- a/test/api/pytest.sh
+++ b/test/api/pytest.sh
@@ -30,8 +30,8 @@ aux prepare_dmeventd
# gdb -ex r --args python FULL_PATH/lvm2/test/api/python_lvm_unit.py -v TestLvm.test_lv_active_inactive
#Locate the python binding library to use.
-if [[ -n $abs_top_builddir ]]; then
- python_lib=($(find $abs_top_builddir -name lvm.so))
+if [[ -n "$abs_top_builddir" ]]; then
+ python_lib=($(find "$abs_top_builddir" -name lvm.so))
if [[ ${#python_lib[*]} -ne 1 ]]; then
if [[ ${#python_lib[*]} -gt 1 ]]; then
# Unable to test python bindings if multiple libraries found:
@@ -43,7 +43,8 @@ if [[ -n $abs_top_builddir ]]; then
fi
fi
- export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH
+ PYTHONPATH=$(dirname "${python_lib[*]}"):$PYTHONPATH
+ export PYTHONPATH
elif rpm -q lvm2-python-libs &>/dev/null; then
true
else
@@ -54,7 +55,8 @@ fi
aux prepare_pvs 6
#Setup which devices the unit test can use.
-export PY_UNIT_PVS=$(cat DEVICES)
+PY_UNIT_PVS=$(cat DEVICES)
+export PY_UNIT_PVS
#python_lvm_unit.py -v -f
diff --git a/test/api/vglist.sh b/test/api/vglist.sh
index c76a92b..b07cac9 100644
--- a/test/api/vglist.sh
+++ b/test/api/vglist.sh
@@ -14,4 +14,4 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
aux prepare_vg 2
-aux apitest vglist $vg `get vg_field $vg vg_uuid | sed -e s,-,,g`
+aux apitest vglist $vg "$(get vg_field $vg vg_uuid | sed -e s,-,,g)"
6 years, 10 months
master - tests: get.sh declare and assign separately
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3d90c7fffc3c7e5fa0a...
Commit: 3d90c7fffc3c7e5fa0a02d829909c204fa0d6bfb
Parent: 834b82b0cd8dfb4867b7eb65e9608e96cf2ba08e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:26:28 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: get.sh declare and assign separately
Declare and assign separately to avoid masking return values.
Also comment-out currently unused orig variable.
---
test/lib/get.sh | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/test/lib/get.sh b/test/lib/get.sh
index 0608bc9..88144c1 100644
--- a/test/lib/get.sh
+++ b/test/lib/get.sh
@@ -28,32 +28,38 @@ trim_() {
}
pv_field() {
- local r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
+ local r
+ r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
vg_field() {
- local r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
+ local r
+ r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
lv_field() {
- local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
+ local r
+ r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
lv_first_seg_field() {
- local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1)
+ local r
+ r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1)
trim_ "$r"
}
lvh_field() {
- local r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
+ local r
+ r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
lva_field() {
- local r=$(lvs -a --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
+ local r
+ r=$(lvs -a --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
@@ -67,8 +73,10 @@ lv_field_lv_() {
lv_tree_devices_() {
local lv="$1/$2"
- local type=$(lv_field "$lv" segtype -a --unbuffered | head -n 1)
- local orig=$(lv_field_lv_ "$lv" origin)
+ local type
+ type=$(lv_field "$lv" segtype -a --unbuffered | head -n 1)
+ #local orig
+ #orig=$(lv_field_lv_ "$lv" origin)
# FIXME: should we count in also origins ?
#test -z "$orig" || lv_tree_devices_ $1 $orig
case "$type" in
@@ -76,7 +84,8 @@ lv_tree_devices_() {
lv_devices "$lv"
;;
mirror|raid*)
- local log=$(lv_field_lv_ "$lv" mirror_log)
+ local log
+ log=$(lv_field_lv_ "$lv" mirror_log)
test -z "$log" || lv_tree_devices_ "$1" "$log"
for i in $(lv_devices "$lv")
do lv_tree_devices_ "$1" "$i"; done
6 years, 10 months
master - tests: get.sh double quote
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=834b82b0cd8dfb4867b...
Commit: 834b82b0cd8dfb4867b7eb65e9608e96cf2ba08e
Parent: d7b381522352c684c5c55657125963533fe98132
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:27:56 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: get.sh double quote
---
test/lib/get.sh | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/lib/get.sh b/test/lib/get.sh
index 0a8c943..0608bc9 100644
--- a/test/lib/get.sh
+++ b/test/lib/get.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2011-2013 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011-2017 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@@ -82,18 +82,18 @@ lv_tree_devices_() {
do lv_tree_devices_ "$1" "$i"; done
;;
thin)
- lv_tree_devices_ "$1" "$(lv_field_lv_ $lv pool_lv)"
+ lv_tree_devices_ "$1" "$(lv_field_lv_ "$lv" pool_lv)"
;;
thin-pool)
- lv_tree_devices_ "$1" "$(lv_field_lv_ $lv data_lv)"
- lv_tree_devices_ "$1" "$(lv_field_lv_ $lv metadata_lv)"
+ lv_tree_devices_ "$1" "$(lv_field_lv_ "$lv" data_lv)"
+ lv_tree_devices_ "$1" "$(lv_field_lv_ "$lv" metadata_lv)"
;;
cache)
- lv_tree_devices_ "$1" "$(lv_devices $lv)"
+ lv_tree_devices_ "$1" "$(lv_devices "$lv")"
;;
cache-pool)
- lv_tree_devices_ "$1" "$(lv_field_lv_ $lv data_lv)"
- lv_tree_devices_ "$1" "$(lv_field_lv_ $lv metadata_lv)"
+ lv_tree_devices_ "$1" "$(lv_field_lv_ "$lv" data_lv)"
+ lv_tree_devices_ "$1" "$(lv_field_lv_ "$lv" metadata_lv)"
;;
esac
}
6 years, 10 months
master - tests: utils.sh separately assign
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d7b381522352c684c5c...
Commit: d7b381522352c684c5c55657125963533fe98132
Parent: cf4b671acd4d7ff87dea3ffa88ff99377d093c50
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 21:22:52 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: utils.sh separately assign
Declare and assign separately to avoid masking return values.
---
test/lib/utils.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index bfa98de..4f3e460 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -188,7 +188,8 @@ STACKTRACE() {
init_udev_transaction() {
if test "$DM_UDEV_SYNCHRONISATION" = 1; then
- local cookie=$(dmsetup udevcreatecookie)
+ local cookie
+ cookie=$(dmsetup udevcreatecookie)
# Cookie is not generated if udev is not running!
test -z "$cookie" || export DM_UDEV_COOKIE=$cookie
fi
6 years, 10 months
master - tests: utils.sh avoid iterating over ls output
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cf4b671acd4d7ff87de...
Commit: cf4b671acd4d7ff87dea3ffa88ff99377d093c50
Parent: 4697937af46f2c95b29c627ef60ec37ba1addcf8
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 21:22:23 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: utils.sh avoid iterating over ls output
---
test/lib/utils.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index 6a46649..bfa98de 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -134,7 +134,7 @@ STACKTRACE() {
echo bt full > gdb_commands.txt
echo l >> gdb_commands.txt
echo quit >> gdb_commands.txt
- for core in $(ls core* 2>/dev/null); do
+ for core in $(echo core* 2>/dev/null); do
bin=$(gdb -batch -c "$core" 2>&1 | grep "generated by" | \
sed -e "s,.*generated by \`\([^ ']*\).*,\1,")
gdb -batch -c "$core" -x gdb_commands.txt "$(which "$bin")"
6 years, 10 months
master - tests: utils.sh arithmetic
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4697937af46f2c95b29...
Commit: 4697937af46f2c95b29c627ef60ec37ba1addcf8
Parent: 00957450ebc08f82382eccef78ce405eeb4461fa
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:19:32 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: utils.sh arithmetic
expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]].
$ is unnecessary on arithmetic variables.
---
test/lib/utils.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index fa072ba..6a46649 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -97,7 +97,7 @@ mkdtemp() {
err=$(mkdir -m 0700 "$candidate_dir" 2>&1) && \
{ echo "$candidate_dir"; return; }
test $MAX_TRIES -le $i && break;
- i=$(expr $i + 1)
+ i=$(( i + 1 ))
done
die "$err"
}
@@ -114,7 +114,7 @@ stacktrace() {
echo "## - $0:${BASH_LINENO[0]}"
while FUNC=${FUNCNAME[$i]}; test "$FUNC" != "main"; do
echo "## $i ${FUNC}() called from ${BASH_SOURCE[$i]}:${BASH_LINENO[$i]}"
- i=$(($i + 1))
+ i=$(( i + 1 ))
done
}
@@ -150,7 +150,7 @@ STACKTRACE() {
test -f "$i" || break # nothing is found (expands to debug.log*)
name=${i##debug.log_}
name=${name%%_*}
- test "$name" = "DEBUG" && { name="$name$idx" ; idx=$(($idx + 1)) ; }
+ test "$name" = "DEBUG" && { name="$name$idx" ; idx=$(( idx + 1 )) ; }
echo "<======== Debug log $i ========>"
sed -e "s,^,## $name: ," "$i"
done
6 years, 10 months
master - tests: utils.sh no mixed string array
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=00957450ebc08f82382...
Commit: 00957450ebc08f82382eccef78ce405eeb4461fa
Parent: c396053955c6481cfc753f498af9a61202ce2d91
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:14:59 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: utils.sh no mixed string array
Argument mixes string and array. Use * or separate argument.
---
test/lib/utils.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index c15eef3..fa072ba 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -223,7 +223,7 @@ skip() {
if test "$#" -eq 0; then
stacktrace
else
- echo "TEST SKIPPED: $@"
+ echo "TEST SKIPPED:" "$@"
fi
touch SKIP_THIS_TEST
exit 200
6 years, 10 months
master - tests: utils.sh double quote
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c396053955c6481cfc7...
Commit: c396053955c6481cfc753f498af9a61202ce2d91
Parent: b442861f50eee6e571143fc8b62131be13e7aa91
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:12:21 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: utils.sh double quote
---
test/lib/utils.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index 60979cc..c15eef3 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -35,16 +35,16 @@ rand_bytes() {
cmds='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n'
data=$( (eval "$cmds") 2>&1 | gzip )
- n_plus_50=$(expr $n + 50)
+ n_plus_50=$(( n + 50 ))
# Ensure that $data has length at least 50+$n
while :; do
len=$(echo "$data" | wc -c)
- test $n_plus_50 -le $len && break;
+ test "$n_plus_50" -le "$len" && break;
data=$( (echo "$data"; eval "$cmds") 2>&1 | gzip )
done
- echo "$data" | dd bs=1 skip=50 count=$n 2>/dev/null \
+ echo "$data" | dd bs=1 skip=50 count="$n" 2>/dev/null \
| tr -c "$chars" "01234567$chars$chars$chars"
}
@@ -137,7 +137,7 @@ STACKTRACE() {
for core in $(ls core* 2>/dev/null); do
bin=$(gdb -batch -c "$core" 2>&1 | grep "generated by" | \
sed -e "s,.*generated by \`\([^ ']*\).*,\1,")
- gdb -batch -c "$core" -x gdb_commands.txt $(which "$bin")
+ gdb -batch -c "$core" -x gdb_commands.txt "$(which "$bin")"
done
fi
@@ -159,7 +159,7 @@ STACKTRACE() {
sed -e "s,^,## STRACE: ," strace.log
fi
dmsetup info -c | grep1_ "$PREFIX" > out
- if test $(wc -l < out) -gt 1 ; then
+ if test "$(wc -l < out)" -gt 1 ; then
echo "<======== Info ========>"
sed -e "s,^,## DMINFO: ," out
echo "<======== Active table ========>"
@@ -258,7 +258,7 @@ if test -z "${installed_testsuite+varset}"; then
case "$PATH" in
*"$abs_top_builddir/test/lib"*) ;;
*)
- PATH="$abs_top_builddir/test/lib":"$abs_top_builddir/test/api":$PATH
+ PATH="$abs_top_builddir/test/lib:$abs_top_builddir/test/api:$PATH"
LD_LIBRARY_PATH=$(find -L "$abs_top_builddir/libdm/" "$abs_top_builddir/tools/"\
"$abs_top_builddir/daemons/" "$abs_top_builddir/liblvm/"\
-name "*.so" -printf "%h:")"$LD_LIBRARY_PATH"
6 years, 10 months
master - tests: lvm-wrapper.sh legacy syntax
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b442861f50eee6e5711...
Commit: b442861f50eee6e571143fc8b62131be13e7aa91
Parent: b1f80512c8965087fd77284078385afc689e845f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:02:36 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: lvm-wrapper.sh legacy syntax
---
test/lib/lvm-wrapper.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/lib/lvm-wrapper.sh b/test/lib/lvm-wrapper.sh
index 41fbec9..129cafe 100644
--- a/test/lib/lvm-wrapper.sh
+++ b/test/lib/lvm-wrapper.sh
@@ -48,6 +48,6 @@ esac
if test -n "$abs_top_builddir"; then
exec $RUN_DBG "$abs_top_builddir/tools/lvm" $CMD "$@"
else # we are testing the lvm on $PATH
- PATH=`echo $PATH | sed -e s,[^:]*lvm2-testsuite[^:]*:,,g`
+ PATH=$(echo "$PATH" | sed -e s,[^:]*lvm2-testsuite[^:]*:,,g)
exec $RUN_DBG lvm $CMD "$@"
fi
6 years, 10 months
master - tests: lvm-wrapper.sh double quote
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b1f80512c8965087fd7...
Commit: b1f80512c8965087fd77284078385afc689e845f
Parent: 32be18959d7899822d80c715fd271410f05462f1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 29 10:01:49 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 29 22:23:17 2017 +0200
tests: lvm-wrapper.sh double quote
---
test/lib/lvm-wrapper.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/lib/lvm-wrapper.sh b/test/lib/lvm-wrapper.sh
index 8a5323b..41fbec9 100644
--- a/test/lib/lvm-wrapper.sh
+++ b/test/lib/lvm-wrapper.sh
@@ -33,9 +33,9 @@ fi
case "$CMD" in
lvs|pvs|vgs|vgck|vgscan)
- test ${LVM_DEBUG_LEVEL:-0} -lt 2 && RUN_DBG= ;;
+ test "${LVM_DEBUG_LEVEL:-0}" -lt 2 && RUN_DBG= ;;
pvcreate|pvremove|lvremove|vgcreate|vgremove)
- test ${LVM_DEBUG_LEVEL:-0} -lt 1 && RUN_DBG= ;;
+ test "${LVM_DEBUG_LEVEL:-0}" -lt 1 && RUN_DBG= ;;
esac
# Capture parallel users of debug.log file
6 years, 10 months