sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

test: fix net_registry tests to correctly capture output of commands inside one test

Browse Source 
so that failure output is not clobbered by  output of previous
successful commands.

Michael
(This used to be commit cb3dafe5fd)
This commit is contained in:
Michael Adam 2008-04-01 15:35:12 +02:00
parent a63c396679
commit 4a99bce736
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source3/script/tests/test_net_registry.sh
View File

@ -73,8 +73,11 @@ test_createkey()
BASEKEY=`dirname $KEY`
SUBKEY=`basename $KEY`
${NETREG} createkey ${KEY}
OUTPUT=`${NETREG} createkey ${KEY}`
if test "x$?" != "x0" ; then
echo "ERROR: createkey ${KEY} failed"
echo "output:"
printf "%s\n" "$OUTPUT"
false
return
fi
@ -108,14 +111,20 @@ test_deletekey()
BASEKEY=`dirname ${KEY}`
SUBKEY=`basename ${KEY}`
test_createkey "${KEY}"
OUTPUT=`test_createkey "${KEY}"`
if test "x$?" != "x0" ; then
printf "%s\n" "${OUTPUT}"
false
return
fi
${NETREG} deletekey ${KEY}
OUTPUT=`${NETREG} deletekey ${KEY}`
if test "x$?" != "x0" ; then
printf "%s\n" "${OUTPUT}"
false
return
fi
# check enumerate of basekey does not show key anymore:
OUTPUT=`${NETREG} enumerate ${BASEKEY}`
@ -148,9 +157,9 @@ test_deletekey_nonexisting()
{
KEY="$1"
test_deletekey "${KEY}"
OUTPUT=`test_deletekey "${KEY}"`
if test "x$?" != "x0" ; then
printf "%s\n" "${OUTPUT}"
false
return
fi
@ -170,17 +179,19 @@ test_createkey_with_subkey()
BASENAME=`dirname ${KEY2}`
SUBKEYNAME1=`basename ${KEY2}`
${NETREG} createkey ${KEY}
OUTPUT=`${NETREG} createkey ${KEY}`
if test "x$?" != "x0" ; then
echo "ERROR: createkey ${KEY} failed"
printf "%s\n" "${OUTPUT}"
false
return
fi
# check we can enumerate to level key
${NETREG} enumerate ${KEY}
OUTPUT=`${NETREG} enumerate ${KEY}`
if test "x$?" != "x0" ; then
echo "ERROR: failed to enumerate '${KEY}' after creation"
printf "%s\n" "${OUTPUT}"
false
return
fi
@ -194,9 +205,9 @@ test_deletekey_with_subkey()
KEY="$1"
KEY2=`dirname ${KEY}`
${NETREG} createkey ${KEY}
OUTPUT=`${NETREG} createkey ${KEY}`
if test "x$?" != "x0" ; then
printf "%s\n" "${OUTPUT}"
false
return
fi
@ -221,15 +232,17 @@ test_setvalue()
VALTYPE="$3"
VALVALUE="$4"
test_createkey ${KEY}
OUTPUT=`test_createkey ${KEY}`
if test "x$?" != "x0" ; then
printf "%s\n" "${OUTPUT}"
false
return
fi
${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE} ${VALVALUE}
OUTPUT=`${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE} ${VALVALUE}`
if test "x$?" != "x0" ; then
echo "ERROR: failed to set value testval in key ${KEY}"
printf "%s\n" "${OUTPUT}"
false
return
fi