diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/build_farm/basicsmb-invalidusers.test | 2 | ||||
| -rw-r--r-- | testsuite/build_farm/basicsmb.fns | 24 | ||||
| -rw-r--r-- | testsuite/build_farm/runlist | 1 |
3 files changed, 4 insertions, 23 deletions
diff --git a/testsuite/build_farm/basicsmb-invalidusers.test b/testsuite/build_farm/basicsmb-invalidusers.test index 7d67cc2fc7..54c9c758c6 100644 --- a/testsuite/build_farm/basicsmb-invalidusers.test +++ b/testsuite/build_farm/basicsmb-invalidusers.test @@ -6,5 +6,3 @@ security="invalidusers" (test_listfilesauth_should_deny $security) || exit 1 -security="validusers" -(test_listfilesauth $security) || exit 1 diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns index bb177704ef..5a41b8bd9d 100644 --- a/testsuite/build_farm/basicsmb.fns +++ b/testsuite/build_farm/basicsmb.fns @@ -21,18 +21,14 @@ # directory when testing. Some of them take a -c parameter, but tpot # says it's not done consistently. -template_setup() { - cat $1.template | \ +template_smb_conf_setup() { + cat basicsmb.smb.conf$1.template | \ sed "s|PREFIX|$prefix|g" | \ sed "s|BUILD_FARM|$test_root|g" | \ sed "s|WHOAMI|$whoami|g" | \ sed "s|LOGLEVEL|$loglevel|g" \ - > $prefix/$2 - echo "template_setup: Created $prefix/$2" -} - -template_smb_conf_setup() { - template_setup "basicsmb.smb.conf$1" "lib/smb.conf$1" + > $prefix/lib/smb.conf$1 + echo "template_smb_conf_setup: Created $prefix/lib/smb.conf$1" } test_smb_conf_setup() { @@ -54,13 +50,7 @@ test_smb_conf_setup() { template_smb_conf_setup template_smb_conf_setup .hostsequiv - template_smb_conf_setup .validusers template_smb_conf_setup .invalidusers - template_smb_conf_setup .preexec - template_smb_conf_setup .preexec_close - template_smb_conf_setup .preexec_cl_fail - - template_setup preexec lib/preexec echo "127.0.0.1 localhost">$prefix/lib/lmhosts echo "127.0.0.2 BUILDFARM">>$prefix/lib/lmhosts @@ -69,12 +59,6 @@ test_smb_conf_setup() { echo "127.0.0.5 SERVER">>$prefix/lib/lmhosts echo "127.0.0.6 DOMAIN">>$prefix/lib/lmhosts echo "127.0.0.7 HOSTSEQUIV">>$prefix/lib/lmhosts - echo "127.0.0.7 VALIDUSERS">>$prefix/lib/lmhosts - echo "127.0.0.7 INVALIDUSERS">>$prefix/lib/lmhosts - echo "127.0.0.7 PREEXEC">>$prefix/lib/lmhosts - echo "127.0.0.7 PREEXEC_CLOSE">>$prefix/lib/lmhosts - echo "127.0.0.7 PREEXEC_CL_FAIL">>$prefix/lib/lmhosts - echo "127.0.0.1" > $prefix/lib/hosts.equiv diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist index bdf92f8712..a7d4808bc3 100644 --- a/testsuite/build_farm/runlist +++ b/testsuite/build_farm/runlist @@ -3,7 +3,6 @@ basicsmb-sharesec basicsmb-usersec \ basicsmb-serversec basicsmb-domainsec basicsmb-domainsec-nt4 \ basicsmb-shareguest basicsmb-hostsequiv basicsmb-invalidusers \ basicsmb-hostsdeny basicsmb-remote-pass-change \ -basicsmb-preexec \ torture-FDPASS torture-LOCK1 torture-LOCK2 \ torture-LOCK3 torture-LOCK4 torture-LOCK5 \ torture-UNLINK torture-BROWSE torture-ATTR \ |