The branch, master has been updated
via fb9319d... s4-selftest: move secdesc.python test to skip list
via 1de7e43... selftest: fixed filter to know about a "error" result
via 959accb... s4-test: removed duplicate knownfail entry
via e5b36c6... s4-pvfs: another uninitialised variable
from 31f1a36... s3: Don't fail authentication when one or some group of
require-membership-of is invalid.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fb9319d971b0dfe46bfaca5c161ee078e9f59875
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Oct 19 13:50:32 2009 +1100
s4-selftest: move secdesc.python test to skip list
This test produces a python backtrace due to
LDAP_INSUFFICIENT_ACCESS_RIGHTS errors, which are expected until the
new acl code is finished. The python backtrace overrides the
'knownfail' listing, so we need to skip this test for now.
commit 1de7e43fb4a4863e3663af8b2a2d9f19cf82d7f3
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Oct 19 13:25:55 2009 +1100
selftest: fixed filter to know about a "error" result
This is what caused some of the python tests to not match knownfail
entries
commit 959accb4e62f528fa9aa62f1405e00912e73f20f
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Oct 19 13:25:07 2009 +1100
s4-test: removed duplicate knownfail entry
commit e5b36c6eaefdbf9e0c05856323bf52ae098a3720
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Oct 19 12:59:49 2009 +1100
s4-pvfs: another uninitialised variable
thanks to valgrind for this one
-----------------------------------------------------------------------
Summary of changes:
selftest/Subunit/Filter.pm | 12 +++++++++---
source4/ntvfs/posix/pvfs_unlink.c | 2 +-
source4/selftest/knownfail | 2 --
source4/selftest/skip | 1 +
4 files changed, 11 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index 93b690d..2b390d1 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -76,6 +76,12 @@ sub start_test($$)
Subunit::start_test($testname);
}
+sub is_failure($)
+{
+ my ($result) = @_;
+ return $result eq "fail" or $result eq "failure" or $result eq "error";
+}
+
sub end_test($$$$$)
{
my ($self, $testname, $result, $unexpected, $reason) = @_;
@@ -84,12 +90,12 @@ sub end_test($$$$$)
$testname = $self->{prefix}.$testname;
}
- if (($result eq "fail" or $result eq "failure") and not $unexpected) {
+ if (is_failure($result) and not $unexpected) {
$result = "xfail";
$self->{xfail_added}++;
}
my $xfail_reason = find_in_list($self->{expected_failures}, $testname);
- if (defined($xfail_reason) and ($result eq "fail" or $result eq
"failure")) {
+ if (defined($xfail_reason) and is_failure($result)) {
$result = "xfail";
$self->{xfail_added}++;
$reason .= $xfail_reason;
@@ -121,7 +127,7 @@ sub start_testsuite($;$)
sub end_testsuite($$;$)
{
my ($self, $name, $result, $reason) = @_;
- if ($self->{xfail_added} and ($result eq "fail" or $result eq
"failure")) {
+ if ($self->{xfail_added} and is_failure($result)) {
$result = "xfail";
}
diff --git a/source4/ntvfs/posix/pvfs_unlink.c
b/source4/ntvfs/posix/pvfs_unlink.c
index e10b2e3..67e7d76 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -109,7 +109,7 @@ static NTSTATUS pvfs_unlink_setup_retry(struct
ntvfs_module_context *ntvfs,
static NTSTATUS pvfs_unlink_file(struct pvfs_state *pvfs,
struct pvfs_filename *name)
{
- NTSTATUS status;
+ NTSTATUS status = NT_STATUS_OK;
if (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) {
return NT_STATUS_FILE_IS_A_DIRECTORY;
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 4797985..6958749 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -57,11 +57,9 @@ samba4.winbind.struct.*.LOOKUP_NAME_SID # Not yet working
in winbind
^samba4.*base.delaywrite.*update of write time using SET_ALLOCATION_SIZE$
^samba4.ldap.python \(dc\).Test add_ldif\(\) with BASE64 security descriptor
input using WRONG domain SID$
^samba4.ldap.python \(dc\).Testing ldb.add_ldif\(\) for nTSecurityDescriptor
-^samba4.ldap.secdesc.python
# some operations don't work over the CIFS NTVFS backend yet (eg. root_fid)
samba4.ntvfs.cifs.base.createx_access
samba4.ntvfs.cifs.base.createx_sharemodes_dir
samba4.ntvfs.cifs.base.maximum_allowed
samba4.base.createx_access # this test is broken for non-administrator users
samba4.smb2.oplock # oplocks in the s4 SMB2 server are a mess
-samba4.ldap.secdesc.python # this is expected to fail until the acl module is
complete
diff --git a/source4/selftest/skip b/source4/selftest/skip
index 38620b0..2af200b 100644
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -66,3 +66,4 @@ samba4.rpc.countcalls # this is not useful now we have full
IDL
samba4.rap.scan # same thing here - we have docs now
samba4.gensec.python # not finished
bench # don't run benchmarks in our selftest
+samba4.ldap.secdesc.python # this is expected to fail until the acl module is
complete
--
Samba Shared Repository
