openstack/devstack
Code Issues Proposed changes

Simplify die_if_error

Browse Source 
* Replace die_if_error() with the simpler die()
* Attempt to clean up unnecessary trace output
* Formatting cleanups on all exercise scripts

Change-Id: I72a542b3a59ee9bf12bee6bcc605edd7579205e0
This commit is contained in:
Dean Troyer
2012-03-16 16:16:56 -05:00
parent 09407d90a8
commit 27e326995a
12 changed files with 155 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/functions.sh
View File

@@ -11,43 +11,28 @@ source $TOP/functions
source $TOP/openrc
echo "Testing die_if_error()"
bash -c "source $TOP/functions; true; die_if_error 'not OK'"
if [[ $? != 0 ]]; then
echo "die_if_error [true] Failed"
fi
bash -c "source $TOP/functions; false; die_if_error 'OK'"
if [[ $? = 0 ]]; then
echo "die_if_error [false] Failed"
else
echo 'OK'
fi
echo "Testing die_if_not_set()"
bash -c "source $TOP/functions; X=`echo Y && true`; die_if_not_set X 'not OK'"
bash -cx "source $TOP/functions; X=`echo Y && true`; die_if_not_set X 'not OK'"
if [[ $? != 0 ]]; then
echo "die_if_not_set [X='Y' true] Failed"
else
echo 'OK'
fi
bash -c "source $TOP/functions; X=`true`; die_if_not_set X 'OK'"
bash -cx "source $TOP/functions; X=`true`; die_if_not_set X 'OK'"
if [[ $? = 0 ]]; then
echo "die_if_not_set [X='' true] Failed"
fi
bash -c "source $TOP/functions; X=`echo Y && false`; die_if_not_set X 'not OK'"
bash -cx "source $TOP/functions; X=`echo Y && false`; die_if_not_set X 'not OK'"
if [[ $? != 0 ]]; then
echo "die_if_not_set [X='Y' false] Failed"
else
echo 'OK'
fi
bash -c "source $TOP/functions; X=`false`; die_if_not_set X 'OK'"
bash -cx "source $TOP/functions; X=`false`; die_if_not_set X 'OK'"
if [[ $? = 0 ]]; then
echo "die_if_not_set [X='' false] Failed"
fi