c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: tests, clean up scripts

Browse source 
Rename variables, use caps, call true by full path, add quotation to
variables and a few wording fixes.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2015-03-09 12:30:26 +01:00
parent a624680b0e
commit 02e1c10e28
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
tests/common
View file

@ -57,26 +57,26 @@ check_all_images()
# some tests need to mount the recovered image and do verifications call
# 'setup_root_helper' and then check for have_root_helper == 1 if the test
# needs to fail otherwise; using sudo by default for now
_sudo=
need_validate=-1
export _sudo
export need_validate
SUDO_HELPER=
NEED_SUDO_VALIDATE=unknown
export SUDO_HELPER
export NEED_SUDO_VALIDATE
root_helper()
{
if [ $UID -eq 0 ]; then
$*
"$@"
else
if [ $need_validate -eq 1 ]; then
sudo -v -n &> /dev/null || \
_not_run "Need validate sudo credential"
sudo -n $*
elif [ $need_validate -eq 0 ]; then
sudo -n true &> /dev/null || \
_not_run "Need validate sudo user setting"
sudo -n $*
if [ "$NEED_SUDO_VALIDATE" = 'yes' ]; then
sudo -v -n &>/dev/null || \
_not_run "Need to validate sudo credentials"
sudo -n "$@"
elif [ "$NEED_SUDO_VALIDATE" = 'no' ]; then
sudo -n /bin/true &> /dev/null || \
_not_run "Need to validate sudo user settings"
sudo -n "$@"
else
# should not happen
_not_run "Need validate root privilege"
_not_run "Need to validate root privileges"
fi
fi
}
@ -86,15 +86,16 @@ setup_root_helper()
if [ $UID -eq 0 ]; then
return
fi
# Test for old sudo or special setting, which makes sudo -v fails even
# user is set NOPASSWD
sudo -n true &> /dev/null && need_validate=0
# Test for old sudo or special settings, which make sudo -v fail even
# if user setting is NOPASSWD
sudo -n /bin/true &>/dev/null && NEED_SUDO_VALIDATE=no
# Newer sudo or default sudo setting
sudo -v -n &> /dev/null && need_validate=1
sudo -v -n &>/dev/null && NEED_SUDO_VALIDATE=yes
if [ $need_validate -eq -1 ]; then
_not_run "Need validate root privilege"
if [ "$NEED_SUDO_VALIDATE" = 'yes' ]; then
_not_run "Need to validate root privileges"
fi
_sudo=root_helper
SUDO_HELPER=root_helper
}

10
tests/fsck-tests/012-leaf-corruption/test.sh
View file

@ -55,20 +55,20 @@ check_inode()
name=$5
# Check whether the inode exists
exists=$($_sudo find $path -inum $ino)
exists=$($SUDO_HELPER find $path -inum $ino)
if [ -z "$exists" ]; then
_fail "inode $ino not recovered correctly"
fi
# Check inode type
found_mode=$(printf "%o" 0x$($_sudo stat $exists -c %f))
found_mode=$(printf "%o" 0x$($SUDO_HELPER stat $exists -c %f))
if [ $found_mode -ne $mode ]; then
echo "$found_mode"
_fail "inode $ino modes not recovered"
fi
# Check inode size
found_size=$($_sudo stat $exists -c %s)
found_size=$($SUDO_HELPER stat $exists -c %s)
if [ $mode -ne 41700 -a $found_size -ne $size ]; then
_fail "inode $ino size not recovered correctly"
fi
@ -90,7 +90,7 @@ check_leaf_corrupt_no_data_ext()
TEST_MNT="$(pwd)/tmp"
fi
mkdir -p $TEST_MNT || _fail "failed to create mount point"
$_sudo mount $image -o ro $TEST_MNT
$SUDO_HELPER mount $image -o ro $TEST_MNT
i=0
while [ $i -lt ${#leaf_no_data_ext_list[@]} ]; do
@ -102,7 +102,7 @@ check_leaf_corrupt_no_data_ext()
${leaf_no_data_ext_list[i + 4]}
((i+=4))
done
$_sudo umount $TEST_MNT
$SUDO_HELPER umount $TEST_MNT
}
setup_root_helper