[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Nov 30 16:31:02 MST 2011
The branch, master has been updated
via 503aeab selftest: Fix typo in socket wrapper test.
via ce359c1 selftest: Drop broken and unused Kvm target.
via 454c450 selftest: Don't acquire target when --list was specified.
via 91c5bd2 Update ldb API sigs.
via 0c8887c Bump ldb version to 1.1.4 after introduction of ldb_module_error.
via 83cad86 selftest: Don't generate subunit file when writing subunit to stdout.
via 3eb5cf2 selftest: Prevent error about unfinished test command when using --list.
via 7c1a884 s4-tests: Use long option names in test list script, to prevent 'eating' --list argument when e.g. is not set.
via 928936a testr: Use test lists.
via 64cfb79 s4-testlist: Write diagnostic info to stderr, and purely test info to stdout.
via 4a9235f selftest: Don't use fancy subunit formatters when generating a test list.
via 956733a selftest: Don't write subunit output in --list mode.
via 1caa3b8 selftesthelpers: write warnings to stderr rather than stdout.
from b638abf s3: Attempt to fix the vfs_commit module
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 503aeabd101bb029e25dda15158df2c8a697c088
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 30 22:57:18 2011 +0100
selftest: Fix typo in socket wrapper test.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Thu Dec 1 00:30:00 CET 2011 on sn-devel-104
commit ce359c14f27c21b0f36ac0ca3078331bbcc7e917
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 30 20:42:58 2011 +0100
selftest: Drop broken and unused Kvm target.
commit 454c4502f333cedf32e553b649d235e5c6f1dd05
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 30 20:42:14 2011 +0100
selftest: Don't acquire target when --list was specified.
commit 91c5bd23a76340d9642f7d318bce6ca3f15b2dc9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 30 20:22:47 2011 +0100
Update ldb API sigs.
commit 0c8887c1cb1560ed9d85e374c9025c54f02d95aa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 30 18:46:31 2011 +0100
Bump ldb version to 1.1.4 after introduction of ldb_module_error.
commit 83cad86821b1addd8ec960ca30b5ff83f2e0ab12
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 21:50:23 2011 +0100
selftest: Don't generate subunit file when writing subunit to stdout.
commit 3eb5cf2914de4ab185c91136fc2de115933a4a37
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 21:07:07 2011 +0100
selftest: Prevent error about unfinished test command when using --list.
commit 7c1a88439664d8c19341cecddb428cac918042be
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 21:05:09 2011 +0100
s4-tests: Use long option names in test list script, to prevent 'eating' --list argument when e.g. is not set.
commit 928936ae0a6ff8db59762769df13ce7b0c99aedd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 19:59:01 2011 +0100
testr: Use test lists.
commit 64cfb79cd5428bb0bdae5e6a2d5eb4e5d5626725
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 19:58:30 2011 +0100
s4-testlist: Write diagnostic info to stderr, and purely test info to stdout.
commit 4a9235f903cc25628cb4a46aec845763b55c4b26
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 19:57:53 2011 +0100
selftest: Don't use fancy subunit formatters when generating a test list.
commit 956733a0e7b62203c0e7f09d15466f696c498d74
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 19:53:35 2011 +0100
selftest: Don't write subunit output in --list mode.
commit 1caa3b8eaea10c342d0dd60e2bfe43221922e8d3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 27 19:52:57 2011 +0100
selftesthelpers: write warnings to stderr rather than stdout.
-----------------------------------------------------------------------
Summary of changes:
.testr.conf | 3 +-
lib/ldb/ABI/{ldb-1.1.2.sigs => ldb-1.1.4.sigs} | 0
...pyldb-util-1.1.2.sigs => pyldb-util-1.1.4.sigs} | 0
lib/ldb/wscript | 2 +-
selftest/selftest.pl | 79 +++++-----
selftest/selftesthelpers.py | 5 +-
selftest/target/Kvm.pm | 162 --------------------
selftest/wscript | 21 ++--
source4/selftest/tests.py | 80 +++++-----
9 files changed, 95 insertions(+), 257 deletions(-)
copy lib/ldb/ABI/{ldb-1.1.2.sigs => ldb-1.1.4.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.2.sigs => pyldb-util-1.1.4.sigs} (100%)
delete mode 100644 selftest/target/Kvm.pm
Changeset truncated at 500 lines:
diff --git a/.testr.conf b/.testr.conf
index e58becd..00d0857 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,3 +1,4 @@
[DEFAULT]
-test_command=./buildtools/bin/waf test --filtered-subunit $IDOPTION
+test_command=./buildtools/bin/waf test --filtered-subunit $IDOPTION $LISTOPT
test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/lib/ldb/ABI/ldb-1.1.2.sigs b/lib/ldb/ABI/ldb-1.1.4.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-1.1.2.sigs
copy to lib/ldb/ABI/ldb-1.1.4.sigs
diff --git a/lib/ldb/ABI/pyldb-util-1.1.2.sigs b/lib/ldb/ABI/pyldb-util-1.1.4.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-1.1.2.sigs
copy to lib/ldb/ABI/pyldb-util-1.1.4.sigs
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 088292c..1a242ae 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'ldb'
-VERSION = '1.1.3'
+VERSION = '1.1.4'
blddir = 'bin'
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 379d7f8..c56f31f 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -26,7 +26,7 @@ selftest - Samba test runner
selftest --help
-selftest [--srcdir=DIR] [--bindir=DIR] [--exeext=EXT][--target=samba|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--testlist=FILE] [TESTS]
+selftest [--srcdir=DIR] [--bindir=DIR] [--exeext=EXT][--target=samba|samba3|win] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--testlist=FILE] [TESTS]
=head1 DESCRIPTION
@@ -56,7 +56,7 @@ Executable extention
Change directory to run tests in. Default is 'st'.
-=item I<--target samba|samba3|win|kvm>
+=item I<--target samba|samba3|win>
Specify test target against which to run. Default is 'samba4'.
@@ -151,7 +151,6 @@ my $opt_one = 0;
my @opt_exclude = ();
my @opt_include = ();
my $opt_verbose = 0;
-my $opt_image = undef;
my $opt_testenv = 0;
my $opt_list = 0;
my $ldap = undef;
@@ -300,8 +299,8 @@ Usage: $Script [OPTIONS] TESTNAME-REGEX
Generic options:
--help this help page
- --target=samba[3]|win|kvm Samba version to target
- --testlist=FILE file to read available tests from
+ --target=samba[3]|win Samba version to target
+ --testlist=FILE file to read available tests from
Paths:
--prefix=DIR prefix to run tests in [st]
@@ -310,7 +309,7 @@ Paths:
--exeext=EXT executable extention []
Target Specific:
- --socket-wrapper-pcap save traffic to pcap directories
+ --socket-wrapper-pcap save traffic to pcap directories
--socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
failed
--socket-wrapper enable socket wrapper
@@ -318,9 +317,6 @@ Target Specific:
Samba4 Specific:
--ldap=openldap|fedora-ds back samba onto specified ldap server
-Kvm Specific:
- --image=PATH path to KVM image
-
Behaviour:
--quick run quick overall test
--one abort when the first test fails
@@ -350,7 +346,6 @@ my $result = GetOptions (
'list' => \$opt_list,
'ldap:s' => \$ldap,
'resetup-environment' => \$opt_resetup_env,
- 'image=s' => \$opt_image,
'testlist=s' => \@testlists,
'load-list=s' => \$opt_load_list,
'binary-mapping=s' => \$opt_binary_mapping
@@ -454,9 +449,9 @@ my $socket_wrapper_dir;
if ($opt_socket_wrapper) {
$socket_wrapper_dir = SocketWrapper::setup_dir("$prefix_abs/w", $opt_socket_wrapper_pcap);
print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
-} else {
+} elsif (not $opt_list) {
unless ($< == 0) {
- print "WARNING: Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports\n";
+ warn("not using socket wrapper, but also not running as root. Will not be able to listen on proper ports");
}
}
@@ -483,32 +478,28 @@ if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
$server_maxtime = $ENV{SMBD_MAXTIME};
}
-if ($opt_target eq "samba") {
- if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
- die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
- }
- $testenv_default = "dc";
- require target::Samba;
- $target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime);
-} elsif ($opt_target eq "samba3") {
- if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
- die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
+unless ($opt_list) {
+ if ($opt_target eq "samba") {
+ if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
+ die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
+ }
+ $testenv_default = "dc";
+ require target::Samba;
+ $target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime);
+ } elsif ($opt_target eq "samba3") {
+ if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
+ die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
+ }
+ $testenv_default = "member";
+ require target::Samba3;
+ $target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $exeext, $server_maxtime);
+ } elsif ($opt_target eq "win") {
+ die("Windows tests will not run with socket wrapper enabled.")
+ if ($opt_socket_wrapper);
+ $testenv_default = "dc";
+ require target::Windows;
+ $target = new Windows();
}
- $testenv_default = "member";
- require target::Samba3;
- $target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $exeext, $server_maxtime);
-} elsif ($opt_target eq "win") {
- die("Windows tests will not run with socket wrapper enabled.")
- if ($opt_socket_wrapper);
- $testenv_default = "dc";
- require target::Windows;
- $target = new Windows();
-} elsif ($opt_target eq "kvm") {
- die("Kvm tests will not run with socket wrapper enabled.")
- if ($opt_socket_wrapper);
- require target::Kvm;
- die("No image specified") unless ($opt_image);
- $target = new Kvm($opt_image, undef);
}
#
@@ -768,13 +759,17 @@ foreach my $testsuite (@available) {
}
if ($match) {
if (defined($skipreason)) {
+ if (not $opt_list) {
Subunit::skip_testsuite($name, $skipreason);
+ }
} else {
push(@todo, $testsuite);
}
}
} elsif (defined($skipreason)) {
- Subunit::skip_testsuite($name, $skipreason);
+ if (not $opt_list) {
+ Subunit::skip_testsuite($name, $skipreason);
+ }
} else {
push(@todo, $testsuite);
}
@@ -793,8 +788,10 @@ if (defined($restricted)) {
my $suitestotal = $#todo + 1;
-Subunit::progress($suitestotal);
-Subunit::report_time(time());
+unless ($opt_list) {
+ Subunit::progress($suitestotal);
+ Subunit::report_time(time());
+}
my $i = 0;
$| = 1;
@@ -897,7 +894,7 @@ sub setup_env($$)
$testenv_vars->{target} = $target;
}
if (not defined($testenv_vars)) {
- warn("$opt_target can't provide environment '$envname'");
+ warn("$opt_target can't provide environment '$envname'");
}
}
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 0cfcb69..fc81c63 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -20,6 +20,7 @@
import os
import subprocess
+import sys
def srcdir():
return os.path.normpath(os.getenv("SRCDIR", os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")))
@@ -105,7 +106,7 @@ def plantestsuite(name, env, cmdline, allow_empty_output=False):
" ".join(filter_subunit_args),
name)
if allow_empty_output:
- print "WARNING: allowing empty subunit output from %s" % name
+ print >>sys.stderr, "WARNING: allowing empty subunit output from %s" % name
def add_prefix(prefix, support_list=False):
@@ -150,7 +151,7 @@ def skiptestsuite(name, reason):
:param reason: Reason the test suite was skipped
"""
# FIXME: Report this using subunit, but re-adjust the testsuite count somehow
- print "skipping %s (%s)" % (name, reason)
+ print >>sys.stderr, "skipping %s (%s)" % (name, reason)
def planperltestsuite(name, path):
diff --git a/selftest/target/Kvm.pm b/selftest/target/Kvm.pm
deleted file mode 100644
index 70fc4bf..0000000
--- a/selftest/target/Kvm.pm
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/perl
-# Start a KVM machine and run a number of tests against it.
-# Copyright (C) 2005-2008 Jelmer Vernooij <jelmer at samba.org>
-# Published under the GNU GPL, v3 or later.
-
-package Kvm;
-
-use strict;
-use Cwd qw(abs_path);
-use FindBin qw($RealBin);
-use POSIX;
-
-sub new($$$$) {
- my ($classname, $dc_image, $vdesocket) = @_;
- my $self = {
- dc_image => $dc_image,
- vdesocket => $vdesocket,
- };
- bless $self;
- return $self;
-}
-
-sub write_kvm_ifup($$$)
-{
- my ($self, $path, $ip_prefix) = @_;
- open(SCRIPT, ">$path/kvm-ifup");
-
- print SCRIPT <<__EOF__;
-#!/bin/sh
-
-PREFIX=$ip_prefix
-
-/sbin/ifconfig \$1 \$PREFIX.1 up
-
-cat <<EOF>$path/udhcpd.conf
-interface \$1
-start \$PREFIX.20
-end \$PREFIX.20
-max_leases 1
-lease_file $path/udhcpd.leases
-pidfile $path/udhcpd.pid
-EOF
-
-touch $path/udhcpd.leases
-
-/usr/sbin/udhcpd $path/udhcpd.conf
-
-exit 0
-__EOF__
- close(SCRIPT);
- chmod(0755, "$path/kvm-ifup");
-
- return ("$path/kvm-ifup", "$path/udhcpd.pid", "$ip_prefix.20");
-}
-
-sub teardown_env($$)
-{
- my ($self, $envvars) = @_;
-
- print "Killing kvm instance $envvars->{KVM_PID}\n";
-
- kill 9, $envvars->{KVM_PID};
-
- if (defined($envvars->{DHCPD_PID})) {
- print "Killing dhcpd instance $envvars->{DHCPD_PID}\n";
- kill 9, $envvars->{DHCPD_PID};
- }
-
- return 0;
-}
-
-sub getlog_env($$)
-{
- my ($self, $envvars) = @_;
-
- return "";
-}
-
-sub check_env($$)
-{
- my ($self, $envvars) = @_;
-
- # FIXME: Check whether $self->{pid} is still running
-
- return 1;
-}
-
-sub read_pidfile($)
-{
- my ($path) = @_;
-
- open(PID, $path);
- <PID> =~ /([0-9]+)/;
- my ($pid) = $1;
- close(PID);
- return $pid;
-}
-
-sub start($$$)
-{
- my ($self, $path, $image) = @_;
-
- my $pidfile = "$path/kvm.pid";
-
- my $opts = (defined($ENV{KVM_OPTIONS})?$ENV{KVM_OPTIONS}:"-nographic");
-
- if (defined($ENV{KVM_SNAPSHOT})) {
- $opts .= " -loadvm $ENV{KVM_SNAPSHOT}";
- }
-
- my $netopts;
- my $dhcp_pid;
- my $ip_address;
-
- if ($self->{vdesocket}) {
- $netopts = "vde,socket=$self->{vdesocket}";
- } else {
- my $ifup_script, $dhcpd_pidfile;
- ($ifup_script, $dhcpd_pidfile, $ip_address) = $self->write_kvm_ifup($path, "192.168.9");
- $netopts = "tap,script=$ifup_script";
- $dhcp_pid = read_pidfile($dhcpd_pidfile);
- }
-
- system("kvm -name \"Samba 4 Test Subject\" $opts -monitor unix:$path/kvm.monitor,server,nowait -daemonize -pidfile $pidfile -snapshot $image -net nic -net $netopts");
-
- return (read_pidfile($pidfile), $dhcp_pid, $ip_address);
-}
-
-sub setup_env($$$)
-{
- my ($self, $envname, $path) = @_;
-
- if ($envname eq "dc") {
- ($self->{dc_pid}, $self->{dc_dhcpd_pid}, $self->{dc_ip}) = $self->start($path, $self->{dc_image});
-
- sub choose_var($$) {
- my ($name, $default) = @_;
- return defined($ENV{"KVM_DC_$name"})?$ENV{"KVM_DC_$name"}:$default;
- }
-
- if ($envname eq "dc") {
- return {
- KVM_PID => $self->{dc_pid},
- DHCPD_PID => $self->{dc_dhcpd_pid},
- USERNAME => choose_var("USERNAME", "Administrator"),
- PASSWORD => choose_var("PASSWORD", "penguin"),
- DOMAIN => choose_var("DOMAIN", "SAMBA"),
- REALM => choose_var("REALM", "SAMBA"),
- SERVER => choose_var("SERVER", "DC"),
- SERVER_IP => $self->{dc_ip},
- NETBIOSNAME => choose_var("NETBIOSNAME", "DC"),
- NETBIOSALIAS => choose_var("NETBIOSALIAS", "DC"),
- };
- } else {
- return undef;
- }
- } else {
- return undef;
- }
-}
-
-1;
diff --git a/selftest/wscript b/selftest/wscript
index b469709..5a2cbd1 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -121,8 +121,6 @@ def cmd_testonly(opt):
env.OPTIONS += ' --socket-wrapper-pcap'
if Options.options.SOCKET_WRAPPER_KEEP_PCAP:
env.OPTIONS += ' --socket-wrapper-keep-pcap'
- if Options.options.LIST:
- env.OPTIONS += ' --list'
if os.environ.get('RUN_FROM_BUILD_FARM') is not None:
env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output'
else:
@@ -176,18 +174,21 @@ def cmd_testonly(opt):
'--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"')
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=samba --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
-
- if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
- cmd += ' | ${FORMAT_TEST_OUTPUT}'
+ env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=samba --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}'
+ if Options.options.LIST:
+ cmd = '${CORE_COMMAND} --list'
else:
- cmd += ' | ${PYTHON} -u ${srcdir}/selftest/filter-subunit'
+ env.OPTIONS += ' --socket-wrapper'
+ cmd = '(${CORE_COMMAND} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS}'
+ if (os.environ.get('RUN_FROM_BUILD_FARM') is None and
+ not Options.options.FILTERED_SUBUNIT):
+ cmd += ' | tee ${SELFTEST_PREFIX}/subunit | ${FORMAT_TEST_OUTPUT}'
runcmd = EXPAND_VARIABLES(opt, cmd)
print("test: running %s" % runcmd)
ret = RUN_COMMAND(cmd, env=env)
- if os.path.exists(".testrepository"):
- # "testr load -q" isn't
+
+ if os.path.exists(".testrepository") and not Options.options.LIST:
testrcmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null'
runcmd = EXPAND_VARIABLES(opt, testrcmd)
RUN_COMMAND(runcmd, env=env)
@@ -196,7 +197,7 @@ def cmd_testonly(opt):
print("ERROR: test failed with exit code %d" % ret)
sys.exit(ret)
- if not os.path.exists(st_done):
+ if not Options.options.LIST and not os.path.exists(st_done):
print("ERROR: test command failed to complete")
sys.exit(1)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index b2779d3..fee0f37 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -44,7 +44,7 @@ def plansmbtorturetestsuite(name, env, options, modname=None):
def smb4torture_testsuites(prefix):
return filter(lambda x: x.startswith(prefix), smb4torture_testsuite_list)
-subprocess.call([smb4torture, "-V"])
+subprocess.call([smb4torture, "-V"], stdout=sys.stderr)
bbdir = os.path.join(srcdir(), "testprogs/blackbox")
@@ -58,7 +58,7 @@ if os.getenv("SELFTEST_QUICK"):
torture_options.append("--option=torture:quick=yes")
smb4torture += " " + " ".join(torture_options)
-print "OPTIONS %s" % " ".join(torture_options)
+print >>sys.stderr, "OPTIONS %s" % " ".join(torture_options)
# Simple tests for LDAP and CLDAP
for options in ['-U"$USERNAME%$PASSWORD" --option=socket:testnonblock=true', '-U"$USERNAME%$PASSWORD"', '-U"$USERNAME%$PASSWORD" -k yes', '-U"$USERNAME%$PASSWORD" -k no', '-U"$USERNAME%$PASSWORD" -k no --sign', '-U"$USERNAME%$PASSWORD" -k no --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --sign']:
@@ -132,8 +132,8 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
elif transport == "ncacn_ip_tcp":
tests = ncacn_ip_tcp_tests
for t in tests:
- plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
- plansmbtorturetestsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions))
+ plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
+ plansmbtorturetestsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions))
#Plugin S4 DC tests (confirms named pipe auth forwarding). This can be expanded once kerberos is supported in the plugin DC
#
@@ -142,14 +142,14 @@ if have_ads_support:
for t in ncacn_np_tests:
env = "plugin_s4_dc"
transport = "ncacn_np"
- plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '-k', 'no'], "samba4.%s with %s" % (t, bindoptions))
+ plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '-k', 'no'], "samba4.%s with %s" % (t, bindoptions))
for bindoptions in [""] + validate_list + ["bigendian"]:
for t in auto_rpc_tests:
- plansmbtorturetestsuite(t, "dc", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
+ plansmbtorturetestsuite(t, "dc", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
--
Samba Shared Repository
More information about the samba-cvs
mailing list