[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  c5f53ed Revert "selftest/skip: add samba.tests.samba_tool.gpo until it's stable"
       via  4d6d6e4 selftest: Avoid returning errors (rather than failures) in gpo test
      from  3b01dd5 s3:winbind: BUG 9386: Failover if netlogon pipe is not available.

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


- Log -----------------------------------------------------------------
commit c5f53ed580d92088f544a7d66b8b276fef8f3ab7
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Nov 12 21:49:36 2012 +1100

    Revert "selftest/skip: add samba.tests.samba_tool.gpo until it's stable"
    
    This reverts commit 47bbf9886f0cebf994435a32bafa07e36cce191b.
    
    This test appears to be stable now, but the changes in the previous
    commit should allow the real error to be found if it comes back.
    
    As requested by metze.
    
    Andrew Bartlett
    
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Nov 13 01:45:04 CET 2012 on sn-devel-104

commit 4d6d6e446c030bb6cf3f27ba257e713ac6701b7a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Nov 12 21:48:46 2012 +1100

    selftest: Avoid returning errors (rather than failures) in gpo test
    
    This should help find the real cause of the flakey test, if it ever returns.
    
    Andrew Bartlett
    
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 selftest/skip                                      |    1 -
 .../scripting/python/samba/tests/samba_tool/gpo.py |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/skip b/selftest/skip
index 097147e..66bb85c 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -105,4 +105,3 @@ bench # don't run benchmarks in our selftest
 ^samba4.drs.delete_object.python # flakey test
 ^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
 ^samba.tests.dcerpc.unix  # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
-^samba.tests.samba_tool.gpo # This is flakey, but reports an error
diff --git a/source4/scripting/python/samba/tests/samba_tool/gpo.py b/source4/scripting/python/samba/tests/samba_tool/gpo.py
index 84154f5..c2e069d 100644
--- a/source4/scripting/python/samba/tests/samba_tool/gpo.py
+++ b/source4/scripting/python/samba/tests/samba_tool/gpo.py
@@ -46,9 +46,11 @@ os.environ["SERVER"])
         """set up a temporary GPO to work with"""
         super(GpoCmdTestCase, self).setUp()
         (result, out, err) = self.runsubcmd("gpo", "create", self.gpo_name, "-H", "ldap://%s" % os.environ["SERVER"], "-U%s%%%s" % (os.environ["USERNAME"], os.environ["PASSWORD"]))
-        self.gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
-
         self.assertCmdSuccess(result, "Ensuring gpo created successfully")
+        try:
+            self.gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
+        except IndexError:
+            self.fail("Failed to find GUID in output: %s" % out)
 
     def tearDown(self):
         """remove the temporary GPO to work with"""


-- 
Samba Shared Repository