summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-02-01 23:31:31 +0000
committerJeremy Allison <jra@samba.org>2002-02-01 23:31:31 +0000
commit57511c6d7dc8c508acdea3a3e87c94426c9d13f3 (patch)
tree7b451dc5a9280ed47a8b93f4e5dcceb39f14c198 /testsuite
parent7d8f52ac8f2d79cf9694bb1774f55b4ccdca5e39 (diff)
downloadsamba-57511c6d7dc8c508acdea3a3e87c94426c9d13f3.tar.gz
samba-57511c6d7dc8c508acdea3a3e87c94426c9d13f3.tar.xz
samba-57511c6d7dc8c508acdea3a3e87c94426c9d13f3.zip
Sync for release.
Jeremy.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/build_farm/basicsmb.smb.conf.server2
-rw-r--r--testsuite/build_farm/torture_setup.fns4
-rw-r--r--testsuite/nsswitch/wbinfo.exp28
3 files changed, 17 insertions, 17 deletions
diff --git a/testsuite/build_farm/basicsmb.smb.conf.server b/testsuite/build_farm/basicsmb.smb.conf.server
index 0b50144119f..976d662bac4 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.server
+++ b/testsuite/build_farm/basicsmb.smb.conf.server
@@ -1,3 +1,3 @@
security=server
password server=user
-smb password file=/dev/null
+smb password file=NON_EXISTANT_FILE
diff --git a/testsuite/build_farm/torture_setup.fns b/testsuite/build_farm/torture_setup.fns
index 3d9abbcd79b..bf5146148ea 100644
--- a/testsuite/build_farm/torture_setup.fns
+++ b/testsuite/build_farm/torture_setup.fns
@@ -6,8 +6,8 @@ test_torture() {
security=USER
(test_smb_conf_setup && test_smbpasswd $password ) || return 1
- echo $pwd/$tree/source/bin/smbtorture //localhost/test -U$whoami%$password $torture_test
- $pwd/$tree/source/bin/smbtorture //localhost/test -U$whoami%$password $torture_test
+ echo $srcdir/bin/smbtorture //localhost/test -U$whoami%$password $torture_test
+ $srcdir/bin/smbtorture //localhost/test -U$whoami%$password $torture_test
status=$?
if [ $status = 0 ]; then
echo "smbtorture test $torture_test worked"
diff --git a/testsuite/nsswitch/wbinfo.exp b/testsuite/nsswitch/wbinfo.exp
index 3518db387be..8be25b2a0f1 100644
--- a/testsuite/nsswitch/wbinfo.exp
+++ b/testsuite/nsswitch/wbinfo.exp
@@ -306,20 +306,20 @@ set goodgroup_sid [util_start "bin/wbinfo" "-n $goodgroup_name"]
# - good uid/gid to sid
set errcode_tests [list \
- { "no arg" "bin/wbinfo" 1 } \
- { "invalid arg" "bin/wbinfo -@" 1 } \
- { "list users" "bin/wbinfo -u" 0 } \
- { "list groups" "bin/wbinfo -g" 0 } \
- { "good name to sid" "bin/wbinfo -n $gooduser_name" 0 } \
- { "bad name to sid" "bin/wbinfo -n asmithee" 0 } \
- { "good sid to name" "bin/wbinfo -s $gooduser_sid" 0 } \
- { "bad sid to name" "bin/wbinfo -s S-1234" 1 } \
- { "bad uid to sid" "bin/wbinfo -U 0" 1 } \
- { "bad gid to sid" "bin/wbinfo -G 0" 1} \
- { "good sid to uid" "bin/wbinfo -S $gooduser_sid" 0 } \
- { "bad sid to uid" "bin/wbinfo -S S-1234" 1 } \
- { "good sid to gid" "bin/wbinfo -Y $goodgroup_sid" 0 } \
- { "bad sid to gid" "bin/wbinfo -Y S-1234" 1 } \
+ { "exit code, no arg" "bin/wbinfo" 1 } \
+ { "exit code, invalid arg" "bin/wbinfo -@" 1 } \
+ { "exit code, list users" "bin/wbinfo -u" 0 } \
+ { "exit code, list groups" "bin/wbinfo -g" 0 } \
+ { "exit code, good name to sid" "bin/wbinfo -n $gooduser_name" 0 } \
+ { "exit code, bad name to sid" "bin/wbinfo -n asmithee" 1 } \
+ { "exit code, good sid to name" "bin/wbinfo -s $gooduser_sid" 0 } \
+ { "exit code, bad sid to name" "bin/wbinfo -s S-1234" 1 } \
+ { "exit code, bad uid to sid" "bin/wbinfo -U 0" 1 } \
+ { "exit code, bad gid to sid" "bin/wbinfo -G 0" 1} \
+ { "exit code, good sid to uid" "bin/wbinfo -S $gooduser_sid" 0 } \
+ { "exit code, bad sid to uid" "bin/wbinfo -S S-1234" 1 } \
+ { "exit code, good sid to gid" "bin/wbinfo -Y $goodgroup_sid" 0 } \
+ { "exit code, bad sid to gid" "bin/wbinfo -Y S-1234" 1 } \
]
foreach { test } $errcode_tests {