s3:tests: Correctly implement tests for forceuser/forcegroup

They used the tmp share ...

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/knownfail.d/smbclient_machine_auth.plain b/selftest/knownfail.d/smbclient_machine_auth.plain
new file mode 100644 (file)
index 0000000..849c8da
--- /dev/null
+++ b/selftest/knownfail.d/smbclient_machine_auth.plain
@@ -0,0 +1,7 @@
+# These envs don't have forceuser/forcegroup shares
+^samba3.blackbox.smbclient_machine_auth.plain.smbclient...addc.forcegroup\(ad_dc:local\)
+^samba3.blackbox.smbclient_machine_auth.plain.smbclient...addc.forceuser\(ad_dc:local\)
+^samba3.blackbox.smbclient_machine_auth.plain.smbclient...dc5.forcegroup\(fl2000dc:local\)
+^samba3.blackbox.smbclient_machine_auth.plain.smbclient...dc5.forceuser\(fl2000dc:local\)
+^samba3.blackbox.smbclient_machine_auth.plain.smbclient...s4member.forcegroup\(s4member:local\)
+^samba3.blackbox.smbclient_machine_auth.plain.smbclient...s4member.forceuser\(s4member:local\)

diff --git a/source3/script/tests/test_smbclient_machine_auth.sh b/source3/script/tests/test_smbclient_machine_auth.sh
index 55ee5738cb705768e6242693241d63446554f85d..c89f84892e751e22d98ca5918b84a7249d676e0d 100755 (executable)
--- a/source3/script/tests/test_smbclient_machine_auth.sh
+++ b/source3/script/tests/test_smbclient_machine_auth.sh
@@ -4,7 +4,7 @@
 
 if [ $# -lt 2 ]; then
        cat <<EOF
-Usage: test_smbclient_machine_auth.sh SERVER SMBCLIENT <smbclient arguments>
+Usage: test_smbclient_machine_auth.sh SERVER SMBCLIENT CONFIGURATION <smbclient arguments>
 EOF
        exit 1
 fi
@@ -31,8 +31,14 @@ test_smbclient "smbclient //${SERVER}/tmp" \
        "quit" "//${SERVER}/tmp" --machine-pass -p 139 "${ADDARGS}" || \
        failed=$((failed + 1))
 
-# Testing these here helps because we know the machine account isn't already this user/group
-testit "smbclient //$SERVER/forceuser" $SMBCLIENT //$SERVER/tmp --machine-pass -p 139 -c quit $ADDARGS
-testit "smbclient //$SERVER/forcegroup" $SMBCLIENT //$SERVER/tmp --machine-pass -p 139 -c quit $ADDARGS
+# Testing these here helps because we know the machine account isn't already
+# this user/group.
+test_smbclient "smbclient //${SERVER}/forceuser" \
+       "quit" "//${SERVER}/forceuser" --machine-pass -p 139 "${ADDARGS}" || \
+       failed=$((failed + 1))
+
+test_smbclient "smbclient //${SERVER}/forcegroup" \
+       "quit" "//${SERVER}/forcegroup" --machine-pass -p 139 "${ADDARGS}" || \
+       failed=$((failed + 1))
 
 exit ${failed}