openstack/devstack
Code Issues Proposed changes

Fix die_if_not_set tests

Browse Source 
The "die_if_not_set" test has the LINENO as a positional argument.
The existing tests are not passing this in, so they are failing.

Along with this, remove the "-x" from the invocation and hide the
output of the tests that are expected to fail to avoid confusion.

Change-Id: Ibf6b9d7bb72b9f92831e1a90292ff8b0bec7faea
This commit is contained in:
Ian Wienand 2015-04-17 13:10:33 +10:00
parent 9b0ebc44f4
commit 9b845da478
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_functions.sh
View File

@ -13,26 +13,26 @@ source $TOP/openrc
echo "Testing die_if_not_set()" echo "Testing die_if_not_set()"
bash -cx "source $TOP/functions; X=`echo Y && true`; die_if_not_set X 'not OK'" bash -c "source $TOP/functions; X=`echo Y && true`; die_if_not_set $LINENO X 'not OK'"
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
echo "die_if_not_set [X='Y' true] Failed" echo "die_if_not_set [X='Y' true] Failed"
else else
echo 'OK' echo 'OK'
fi fi
bash -cx "source $TOP/functions; X=`true`; die_if_not_set X 'OK'" bash -c "source $TOP/functions; X=`true`; die_if_not_set $LINENO X 'OK'" > /dev/null 2>&1
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
echo "die_if_not_set [X='' true] Failed" echo "die_if_not_set [X='' true] Failed"
fi fi
bash -cx "source $TOP/functions; X=`echo Y && false`; die_if_not_set X 'not OK'" bash -c "source $TOP/functions; X=`echo Y && false`; die_if_not_set $LINENO X 'not OK'"
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
echo "die_if_not_set [X='Y' false] Failed" echo "die_if_not_set [X='Y' false] Failed"
else else
echo 'OK' echo 'OK'
fi fi
bash -cx "source $TOP/functions; X=`false`; die_if_not_set X 'OK'" bash -c "source $TOP/functions; X=`false`; die_if_not_set $LINENO X 'OK'" > /dev/null 2>&1
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
echo "die_if_not_set [X='' false] Failed" echo "die_if_not_set [X='' false] Failed"
fi fi