diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-03 17:05:24 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-03 17:07:44 +0100 |
| commit | 484c4a5955d0365beb9587bb15c73fe3ed3301ce (patch) | |
| tree | 795db93837fadcc040c4169434e5b64d0509fb84 | |
| parent | aa9592991a1f406708fc08fd32cd630f0e9ed43d (diff) | |
| download | samba-484c4a5955d0365beb9587bb15c73fe3ed3301ce.tar.gz samba-484c4a5955d0365beb9587bb15c73fe3ed3301ce.tar.bz2 samba-484c4a5955d0365beb9587bb15c73fe3ed3301ce.zip | |
Revert "s3:selftest: create BUILTIN\\Administrators at startup"
This reverts commit a849183f9492d09ccd7e273f955d4d8f2668fdf3.
This is to racy for most of the build-farm machines,
because winbindd doesn't start fast enough.
metze
| -rwxr-xr-x | source3/script/tests/selftest.sh | 7 | ||||
| -rwxr-xr-x | source3/script/tests/test_net_registry.sh | 15 |
2 files changed, 10 insertions, 12 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index c02e0ee183..94621841f5 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -345,13 +345,6 @@ START=`date` bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2 MAKE_TEST_BINARY="" - MAKE_TEST_BINARY="bin/net" - printf "%s" "creating BUILTIN\\Administrators..." - bin/net -s $SERVERCONFFILE sam createbuiltingroup \ - Administrators > /dev/null 2>&1 || exit 1 - echo "DONE" - MAKE_TEST_BINARY="" - failed=0 . $SCRIPTDIR/tests_$SUBTESTS.sh diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index a3d1a24fd8..52a78bc339 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -7,10 +7,8 @@ RPC="$1" NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION" -NETREMOTE="${NET} -U${USERNAME}%${PASSWORD} -S ${SERVER} -I ${SERVER_IP}" - if test "x${RPC}" = "xrpc" ; then - NETREG="${NETREMOTE} rpc registry" + NETREG="${NET} -U${USERNAME}%${PASSWORD} -I ${SERVER_IP} rpc registry" else NETREG="${NET} registry" fi @@ -336,7 +334,14 @@ test_setvalue_twice() give_administrative_rights() { - ${NETREMOTE} rpc group addmem BUILTIN\\Administrators $USERNAME + bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators + if test "x$?" != "x0" ; then + echo "ERROR: creating builtin group Administrators" + false + return + fi + + bin/net -s $SERVERCONFFILE sam addmem BUILTIN\\Administrators $USERNAME if test "x$?" != "x0" ; then echo "ERROR: adding user $USERNAME to BUILTIN\\Administrators" false @@ -347,7 +352,7 @@ give_administrative_rights() take_administrative_rights() { - ${NETREMOTE} rpc group delmem BUILTIN\\Administrators $USERNAME + bin/net -s $SERVERCONFFILE sam delmem BUILTIN\\Administrators $USERNAME if test "x$?" != "x0" ; then echo "ERROR: removing user $USERNAME from BUILTIN\\Administrators" false |