[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Jan 19 12:24:02 MST 2011
The branch, master has been updated
via dd141cf wafsamba: quote CPP and CC values when calling pidl
via 448388e s4:selftest/skip: add samba4.tokengroups.python
from 916cc7b s4-dsdb Add PAC validation test to tokengroups test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dd141cf5f735e3c0ecf7517cdc83cbacd678e644
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jan 19 16:53:39 2011 +0100
wafsamba: quote CPP and CC values when calling pidl
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Jan 19 20:23:50 CET 2011 on sn-devel-104
commit 448388e609f9d6bad68a187983fa2507492e6511
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jan 19 17:33:59 2011 +0100
s4:selftest/skip: add samba4.tokengroups.python
This fails randomly like this with an error (not a failure):
[651/695 in 27m37s] samba4.tokengroups.python(dc)
running client gensec_update
UNEXPECTED(error): samba4.tokengroups.python(dc).__main__.TokenTest.test_pac_groups
REASON: _StringException: _StringException: Content-Type: text/x-traceback;charset=utf8,language=python
traceback
1E2
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 128, in _run_user
return fn(*args)
File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 368, in _run_test_method
testMethod()
File "/memdisk/tridge/flakey/b2413/source4/source4/dsdb/tests/python/token_group.py", line 142, in test_pac_groups
(client_finished, client_to_server) = gensec_client.update(server_to_client)
TypeError: expected a string
0
FAILED (0 failures and 1 errors in 0 testsuites)
A summary with detailed information can be found in:
./st/summary
test: running (/usr/bin/perl /memdisk/tridge/flakey/b2413/source4/source4/../selftest/selftest.pl --prefix=./st --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="/usr/bin/python ./selftest/tests.py|" --exclude=./selftest/slow --socket-wrapper && touch ./st/st_done) | /usr/bin/python -u ../selftest/filter-subunit --expected-failures=./selftest/knownfail --fail-immediately | tee ./st/subunit | /usr/bin/python -u ../selftest/format-subunit --prefix=./st --immediate
ERROR: test failed with exit code 1
metze
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_pidl.py | 8 ++++----
source4/selftest/knownfail | 2 +-
source4/selftest/skip | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index 2770728..f40066e 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -62,9 +62,9 @@ def SAMBA_PIDL(bld, pname, source,
cc = ""
if bld.CONFIG_SET("CPP"):
if isinstance(bld.CONFIG_GET("CPP"), list):
- cpp = "CPP=%s" % bld.CONFIG_GET("CPP")[0]
+ cpp = 'CPP="%s"' % bld.CONFIG_GET("CPP")[0]
else:
- cpp = "CPP=%s" % bld.CONFIG_GET("CPP")
+ cpp = 'CPP="%s"' % bld.CONFIG_GET("CPP")
if cpp == "CPP=xlc_r":
cpp = ""
@@ -72,9 +72,9 @@ def SAMBA_PIDL(bld, pname, source,
if bld.CONFIG_SET("CC"):
if isinstance(bld.CONFIG_GET("CC"), list):
- cc = "CC=%s" % bld.CONFIG_GET("CC")[0]
+ cc = 'CC="%s"' % bld.CONFIG_GET("CC")[0]
else:
- cc = "CC=%s" % bld.CONFIG_GET("CC")
+ cc = 'CC="%s"' % bld.CONFIG_GET("CC")
t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc),
ext_out = '.c',
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 1d03a53..c10730b 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -79,4 +79,4 @@ samba4.smb2.compound.*.related2
samba4.smb2.compound.*.invalid2
samba4.ldap.acl.*.search.* # ACL search behaviour not enabled by default
samba4.ldap.acl.*.ntSecurityDescriptor.* # ACL extended checks on search not enabled by default
-
+samba4.tokengroups.python # randomly fails
diff --git a/source4/selftest/skip b/source4/selftest/skip
index 671269a..f6592de 100644
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -84,3 +84,4 @@ smb2.acls # new test which doesn't pass yet
# ktutil might not be installed or from mit...
# we should build a samba4ktutil and use that instead
samba4.blackbox.ktpass # this test isn't portable ...
+samba4.tokengroups.python # randonly fails with an error
--
Samba Shared Repository
More information about the samba-cvs
mailing list