From 4d6d6e446c030bb6cf3f27ba257e713ac6701b7a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 12 Nov 2012 21:48:46 +1100 Subject: [PATCH] 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 --- source4/scripting/python/samba/tests/samba_tool/gpo.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/tests/samba_tool/gpo.py b/source4/scripting/python/samba/tests/samba_tool/gpo.py index 84154f57563..c2e069d2b61 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""" -- 2.11.4.GIT