autobuild: intermittent test failure detected

[autobuild]

The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2011-10-03-1249/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-10-03-1249/samba3.stderr
   http://git.samba.org/autobuild.flakey/2011-10-03-1249/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-10-03-1249/samba4.stderr
   http://git.samba.org/autobuild.flakey/2011-10-03-1249/samba4.stdout
  
The top commit at the time of the failure was:

commit 1dbcb61c79a0c06fdcfa36bb9304fb0fb66d7ff8
Author: Kai Blin k...@samba.org
Date:   Thu Sep 29 19:34:08 2011 -0700

dns: Move the dns_srv_record to the correct place in the idl file

Autobuild-User: Kai Blin k...@samba.org
Autobuild-Date: Sun Oct  2 13:35:49 CEST 2011 on sn-devel-104

[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
   via  d6c949b testtools: Import new upstream snapshot.
  from  1dbcb61 dns: Move the dns_srv_record to the correct place in the 
idl file

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit d6c949b0748014587a05d2af1c2b4770d16d68a9
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Oct 3 12:20:19 2011 +0200

testtools: Import new upstream snapshot.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Oct  3 13:54:06 CEST 2011 on sn-devel-104

---

Summary of changes:
 lib/testtools/NEWS |   32 -
 lib/testtools/doc/for-test-authors.rst |   12 ++-
 lib/testtools/scripts/all-pythons  |9 +-
 lib/testtools/testtools/__init__.py|2 +-
 lib/testtools/testtools/compat.py  |   95 +++-
 lib/testtools/testtools/matchers.py|   76 --
 lib/testtools/testtools/testcase.py|   11 +-
 lib/testtools/testtools/tests/test_compat.py   |  127 +++
 lib/testtools/testtools/tests/test_matchers.py |  201 +++-
 lib/testtools/testtools/tests/test_testcase.py |   65 -
 10 files changed, 597 insertions(+), 33 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/testtools/NEWS b/lib/testtools/NEWS
index 6588b8d..5896b84 100644
--- a/lib/testtools/NEWS
+++ b/lib/testtools/NEWS
@@ -6,6 +6,22 @@ Changes and improvements to testtools_, grouped by release.
 NEXT
 
 
+
+0.9.12
+~~
+
+This is a very big release.  We've made huge improvements on three fronts:
+ 1. Test failures are way nicer and easier to read
+ 2. Matchers and ``assertThat`` are much more convenient to use
+ 3. Correct handling of extended unicode characters
+
+We've trimmed off the fat from the stack trace you get when tests fail, we've
+cut out the bits of error messages that just didn't help, we've made it easier
+to annotate mismatch failures, to compare complex objects and to match raised
+exceptions.
+
+Testing code was never this fun.
+
 Changes
 ---
 
@@ -14,6 +30,12 @@ Changes
   now deprecated.  Please stop using it.
   (Jonathan Lange, #813460)
 
+* ``assertThat`` raises ``MismatchError`` instead of
+  ``TestCase.failureException``.  ``MismatchError`` is a subclass of
+  ``AssertionError``, so in most cases this change will not matter. However,
+  if ``self.failureException`` has been set to a non-default value, then
+  mismatches will become test errors rather than test failures.
+
 * ``gather_details`` takes two dicts, rather than two detailed objects.
   (Jonathan Lange, #801027)
 
@@ -30,12 +52,16 @@ Improvements
 * All public matchers are now in ``testtools.matchers.__all__``.
   (Jonathan Lange, #784859)
 
-* assertThat output is much less verbose, displaying only what the mismatch
+* ``assertThat`` can actually display mismatches and matchers that contain
+  extended unicode characters. (Jonathan Lange, Martin [gz], #804127)
+
+* ``assertThat`` output is much less verbose, displaying only what the mismatch
   tells us to display. Old-style verbose output can be had by passing
   ``verbose=True`` to assertThat. (Jonathan Lange, #675323, #593190)
 
-* assertThat accepts a message which will be used to annotate the matcher. This
-  can be given as a third parameter or as a keyword parameter. (Robert Collins)
+* ``assertThat`` accepts a message which will be used to annotate the matcher.
+  This can be given as a third parameter or as a keyword parameter.
+  (Robert Collins)
 
 * Automated the Launchpad part of the release process.
   (Jonathan Lange, #623486)
diff --git a/lib/testtools/doc/for-test-authors.rst 
b/lib/testtools/doc/for-test-authors.rst
index eec98b1..04c4be6 100644
--- a/lib/testtools/doc/for-test-authors.rst
+++ b/lib/testtools/doc/for-test-authors.rst
@@ -717,7 +717,7 @@ generates.  Here's an example mismatch::
   self.remainder = remainder
 
   def describe(self):
-  return %s is not divisible by %s, %s remains % (
+  return %r is not divisible by %r, %r remains % (
   self.number, self.divider, self.remainder)
 
   def get_details(self):
@@ -738,11 +738,19 @@ in the Matcher itself like this::
   remainder = actual % self.divider
   if remainder != 0:
   return Mismatch(
-  %s is not divisible by %s, %s remains % (
+  %r is not divisible by %r, %r remains % (
   actual, self.divider, remainder))
   else:
   return None
 
+When writing a ``describe`` method or constructing a ``Mismatch`` object the
+code should ensure it only emits printable unicode.  As this output must be
+combined with other text and forwarded for presentation, letting through
+non-ascii bytes of ambiguous encoding or control characters could throw 

[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
   via  e6b33a5 s3-docs: Fix typos.
  from  3d2c591 s3:smb2_server: SMB2_OP_CANCEL requests don't have to be 
signed

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit e6b33a5a3f83272d7e6dea66b1f15db4b19d3170
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 6 19:58:22 2011 +0200

s3-docs: Fix typos.

Thanks to Samba-JP oota rib...@samba.gr.jp for reporting!

Karolin

Autobuild-User: Karolin Seeger ksee...@samba.org
Autobuild-Date: Fri Sep 30 23:12:35 CEST 2011 on sn-devel-104
(cherry picked from commit 5c569a97ab477a324a96aae7f58770ccbe2572de)

---

Summary of changes:
 .../Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml  |2 +-
 docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml|2 +-
 docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml 
b/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
index 2ecfa4b..a6c1af0 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
@@ -265,7 +265,7 @@ is the best tool in your network environment.
para
 indextermprimaryLAN/primary/indexterm
 indextermprimarythin client/primary/indexterm
-   ThinLinc an be used both in the LAN environment to implement a Thin 
Client strategy for an organization, and as
+   ThinLinc can be used both in the LAN environment to implement a Thin 
Client strategy for an organization, and as
secure remote access solution for people working from remote locations, 
even over smallband connections.
ThinLinc is free to use for a single concurrent user.
/para
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml 
b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index 7058112..bb05de4 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -3716,7 +3716,7 @@ Just put it in a frame and bolt it to the wall with the 
heading MY FIRST RPCCLI
 para
 indextermprimaryadddriver/primary/indexterm
 The setdriver command will fail if in Samba's mind the queue is not
-already there. A successful installation displys the promising message that 
the:
+already there. A successful installation displays the promising message that 
the:
 screen
 Printer Driver ABC successfully installed.
 /screen
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml 
b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
index d431899..440498f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
@@ -366,7 +366,7 @@ Setting up Japanese charsets is quite difficult. This is 
mainly because:
In addition, although it is not directly concerned with 
Samba, since
there is a delicate difference between the iconv() 
function, which is
generally used on UNIX, and the functions used on other 
platforms,
-   such as Windows and Java, so far is concerens the 
conversion between
+   such as Windows and Java, so far is concerns the 
conversion between
Shift_JIS and Unicode UTF-8 must be done with care and 
recognition
of the limitations involved in the process.
/para


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
   via  149875f Fix bug #8493 - DFS breaks zip file extracting unless 
follow symlinks = no set
  from  e6b33a5 s3-docs: Fix typos.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 149875f887287dbbf016d2252962b023b0bae967
Author: Jeremy Allison j...@samba.org
Date:   Fri Sep 30 13:35:59 2011 -0700

Fix bug #8493 - DFS breaks zip file extracting unless follow symlinks = 
no set

If a client sends a mangled name as part of a DFS path, use the
post-mangled name for the pathname walk, not the mangled name.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Oct  1 00:45:59 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/smbd/msdfs.c |   13 ++---
 1 files changed, 2 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 3bdedb8..f0f5d06 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -575,15 +575,10 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
conn-connectpath, pdp-reqpath));
 
/*
-* Note the unix path conversion here we're doing we can
+* Note the unix path conversion here we're doing we
 * throw away. We're looking for a symlink for a dfs
 * resolution, if we don't find it we'll do another
 * unix_convert later in the codepath.
-* If we needed to remember what we'd resolved in
-* dp-reqpath (as the original code did) we'd
-* copy (localhost, dp-reqpath) on any code
-* path below that returns True - but I don't
-* think this is needed. JRA.
 */
 
status = unix_convert(ctx, conn, pdp-reqpath, smb_fname,
@@ -594,11 +589,7 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
 NT_STATUS_OBJECT_PATH_NOT_FOUND)) {
return status;
}
-
-   /* Create an smb_fname to use below. */
-   status = create_synthetic_smb_fname(ctx, pdp-reqpath, NULL,
-   NULL, smb_fname);
-   if (!NT_STATUS_IS_OK(status)) {
+   if (smb_fname == NULL || smb_fname-base_name == NULL) {
return status;
}
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
   via  1ed1b19 Fix bug #8493 - DFS breaks zip file extracting unless 
follow symlinks = no set
  from  4c06073 s3-docs: Remove experimental label on VFS ACL modules

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -
commit 1ed1b19b2eeda3217d03d66d4220abd871b03cb4
Author: Jeremy Allison j...@samba.org
Date:   Fri Sep 30 13:35:59 2011 -0700

Fix bug #8493 - DFS breaks zip file extracting unless follow symlinks = 
no set

If a client sends a mangled name as part of a DFS path, use the
post-mangled name for the pathname walk, not the mangled name.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Oct  1 00:45:59 CEST 2011 on sn-devel-104
(cherry picked from commit 149875f887287dbbf016d2252962b023b0bae967)

---

Summary of changes:
 source3/smbd/msdfs.c |   13 ++---
 1 files changed, 2 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 6a2f756..0480b58 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -525,15 +525,10 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
conn-connectpath, pdp-reqpath));
 
/*
-* Note the unix path conversion here we're doing we can
+* Note the unix path conversion here we're doing we
 * throw away. We're looking for a symlink for a dfs
 * resolution, if we don't find it we'll do another
 * unix_convert later in the codepath.
-* If we needed to remember what we'd resolved in
-* dp-reqpath (as the original code did) we'd
-* copy (localhost, dp-reqpath) on any code
-* path below that returns True - but I don't
-* think this is needed. JRA.
 */
 
status = unix_convert(ctx, conn, pdp-reqpath, smb_fname,
@@ -544,11 +539,7 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
 NT_STATUS_OBJECT_PATH_NOT_FOUND)) {
return status;
}
-
-   /* Create an smb_fname to use below. */
-   status = create_synthetic_smb_fname(ctx, pdp-reqpath, NULL,
-   NULL, smb_fname);
-   if (!NT_STATUS_IS_OK(status)) {
+   if (smb_fname == NULL || smb_fname-base_name == NULL) {
return status;
}
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
   via  6b5d8e0 s4-subdomain: create trust record with forest root DC
   via  8905344 s4-dsdb: fixed re-join of subdomain
   via  28a6881 s4-lsa: fixed set of trust password with old password
   via  e9758ef s4-dns: add all forest DCs to named.conf.update
   via  7244e25 s4-ldap: added DSDB_CONTROL_NO_GLOBAL_CATALOG to ldap 
encoding list
   via  0ef8dca s4-kdc: fixed handling of previous vs current trust password
   via  71f3a25 s4-auth: rework map_user_info() to use cracknames
   via  0c944d0 s4-sam: don't look in GC NCs for user accounts
   via  aee896a s4-kdc: don't look at global catalog NCs in the kdc
   via  5717da3 s4-kdc: treat a kvno of 255 as unspecified
   via  6356f4c s4-kcc: if we are a GC, auto-add partial replicas
   via  278e44c s4-dsdb: simplify samdb_is_gc()
   via  f469369 s4-dsdb: add the DSDB_CONTROL_PARTIAL_REPLICA when needed
   via  6b69ecd heimdal: handle referrals for 3 part DRSUAPI SPNs
   via  b930b1e s4-repl: try harder to find the right SPN in replication 
server
   via  60cbc98 s4-dsdb: added new control DSDB_MODIFY_PARTIAL_REPLICA
   via  fb937af s4-join: enable cleanup on failed join
   via  efb3f45 s4-drs: added DSDB_REPL_FLAG_ADD_NCNAME to DsAddEntry call
   via  1870fc4 s4-dsdb: added DSDB_REPL_FLAG_ADD_NCNAME flag
   via  50d6a76 s4-dsdb: fixed formatting of a debug message
   via  d12309d s4-partition: allow creation of uninstantiated partitions
   via  f52d8ca s4-dsdb: allow uninstantiated NC heads
   via  faf8581 s4-repl: support creation of new NCs via DsAddEntry
   via  df3cc35 s4-repl: fixed formatting of some debug messages
   via  004f8c6 drsuapi: added ncName attid in enum
   via  7d18241 dns: added example python script for dnsserver protocol
   via  57e30bc0 dns: build python bindings for dnsserver RPC protocol
   via  ff482bc dns: filled in dnsserver.idl
   via  2fbdaab samba-tool: cope with GC compares in ldapcmp
   via  aed0d2e samba-tool: added --full-sync and --sync-all options to 
samba-tool drs replicate
   via  5d4f474 s4-dbchecker: fixed handling of DSDB DNs in dbcheck
   via  ac581b3 s4-dsdb: update callers to dsdb_convert_object_ex()
   via  761fd4a s4-repl: update instanceType in partial_replica replication
   via  f37e81b s4-repl: add FULL_SYNC and PARTIAL_REPLICA flags
   via  bdc9319 s4-dsdb: implement DSDB_REPL_FLAG_PRIORITISE_INCOMING
   via  f45147b s4-dsdb: disallow changes based on instanceType
   via  d3fa496 s4-dsdb: added DSDB_REPL_FLAG* to replication
   via  0d2d6c9 s4-ldap-server: disallow all modifies on global catalog port
   via  1df1003 s4-ldb: enable display of partialAttributeSet with 
--show-binary
  from  d6c949b testtools: Import new upstream snapshot.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6b5d8e02f78ed2039ea25edeb372d5b86089e3df
Author: Andrew Tridgell tri...@samba.org
Date:   Sat Oct 1 10:58:52 2011 +1000

s4-subdomain: create trust record with forest root DC

when we create a sub-subdomain we need to use the forest naming master
to setup the partition changes for the new subdomain. We also need to
setup the trust with the forest root, as that allows us to create the
needed _msdcs DNS entries in the forest

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Oct  4 07:40:59 CEST 2011 on sn-devel-104

commit 8905344bad2a22c6271340f04093c7bd0e10f348
Author: Andrew Tridgell tri...@samba.org
Date:   Sat Oct 1 10:57:14 2011 +1000

s4-dsdb: fixed re-join of subdomain

if we repeat the join of a subdomain then we try to re-create the NC
for the subdomain during a DsAddEntry(). This allows that re-creation
to succeed if the NC already exists

commit 28a6881d4f4aac814cb01ca87e113caf4b1c8026
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Sep 30 09:03:39 2011 +1000

s4-lsa: fixed set of trust password with old password

the calculation of add_incoming and add_outgoing was not correct when
a trust was already in place

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

commit e9758ef94de98dd253a79547d2109bcd714f8517
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Sep 30 07:43:54 2011 +1000

s4-dns: add all forest DCs to named.conf.update

this allows all DCs to update DNS entries

commit 7244e254cc28fc3f4273731a53a21ab81c330baa
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Sep 30 07:08:15 2011 +1000

s4-ldap: added DSDB_CONTROL_NO_GLOBAL_CATALOG to ldap encoding list

also remove all the duplicated comments

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

commit 0ef8dca9fb69154f50807d0a56aeb24614d73399
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Sep 30 06:47:08 2011 +1000