sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s3: registry: let test_setvalue use getvalueraw instead of enumerate

Browse Source 
simplifies code, prerequisite to handle empty valuenames

Signed-off-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Gregor Beck 2010-05-19 12:20:10 +02:00 committed by Michael Adam
parent 0a173444ac
commit 12ce164384
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,38 +256,22 @@ test_setvalue()
return
fi
OUTPUT=`${NETREG} enumerate ${KEY}`
OUTPUT=`${NETREG} getvalueraw ${KEY} ${VALNAME}`
if test "x$?" != "x0" ; then
echo "ERROR: failure calling enumerate for key ${KEY}"
echo "ERROR: failure calling getvalueraw for key ${KEY}"
echo output:
printf "%s\n" "${OUTPUT}"
false
return
fi
printf "%s\n" "$OUTPUT" | {
FOUND=0
while read LINE ; do
SEARCH1=`echo $LINE | grep '^Valuename' | grep ${VALNAME}`
if test "x$?" = "x0" ; then
read LINE
read LINE
SEARCH2=`echo $LINE | grep '^Value ' | grep ${VALVALUE}`
if test "x$?" = "x0" ; then
FOUND=1
break
fi
fi
done
if test "x$FOUND" != "x1" ; then
echo "ERROR: did not find value '${VALNAME}' with enumerate"
echo "enumerate output:"
printf "%s\n" "$OUTPUT"
if test "x${OUTPUT}" != "x${VALVALUE}" ; then
echo "ERROR: failure retrieving value ${VALNAME} for key ${KEY}"
printf "expected: %s\ngot: %s\n" "${VALVALUE}" "${OUTPUT}"
false
return
fi
}
}
test_deletevalue()