sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

selftest: Apply rename filepath arguments so binary mapping doesn't have to.

Browse Source 
Signed-off-by: Adrian Cochrane <adrianc@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Adrian Cochrane 2015-06-05 15:18:19 +12:00 committed by Michael Adam
parent 873d3ccd48
commit 47ad5d27eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
selftest/selftesthelpers.py
View File

@ -161,7 +161,7 @@ samba3srcdir = source3dir()
bbdir = os.path.join(srcdir(), "testprogs/blackbox") bbdir = os.path.join(srcdir(), "testprogs/blackbox")
configuration = "--configfile=$SMB_CONF_PATH" configuration = "--configfile=$SMB_CONF_PATH"
smbtorture4 = binpath("smbtorture4") smbtorture4 = binpath("smbtorture")
smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines() smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
smbtorture4_options = [ smbtorture4_options = [
@ -187,9 +187,9 @@ def smbtorture4_testsuites(prefix):
return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list) return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
smbclient3 = binpath('smbclient3') smbclient3 = binpath('smbclient')
smbtorture3 = binpath('smbtorture3') smbtorture3 = binpath('smbtorture3')
ntlm_auth3 = binpath('ntlm_auth3') ntlm_auth3 = binpath('ntlm_auth')
net = binpath('net') net = binpath('net')
scriptdir = os.path.join(srcdir(), "script/tests") scriptdir = os.path.join(srcdir(), "script/tests")

2
selftest/target/Samba3.pm
View File

@ -1558,7 +1558,7 @@ sub wait_for_start($$$$$)
my $count = 0; my $count = 0;
do { do {
$ret = system(Samba::bindir_path($self, "smbclient3") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139"); $ret = system(Samba::bindir_path($self, "smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139");
if ($ret != 0) { if ($ret != 0) {
sleep(2); sleep(2);
} }