From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 12 Nov 2012 10:48:46 +0000 (+1100)
Subject: selftest: Avoid returning errors (rather than failures) in gpo test
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=4d6d6e446c030bb6cf3f27ba257e713ac6701b7a

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@samba.org>
---

diff --git a/source4/scripting/python/samba/tests/samba_tool/gpo.py b/source4/scripting/python/samba/tests/samba_tool/gpo.py
index 84154f575635..c2e069d2b619 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"""