From: Douglas Bagnall Date: Wed, 17 Oct 2018 04:21:09 +0000 (+1300) Subject: py3_tests/kcc : test_verify can hit KCCError as well as GraphError X-Git-Tag: tdb-1.3.17~1282 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30e9c00f2d8ba6395deb4fe8734e41b1000f13f0;p=thirdparty%2Fsamba.git py3_tests/kcc : test_verify can hit KCCError as well as GraphError Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/kcc/__init__.py b/python/samba/tests/kcc/__init__.py index a8b50709d1b..3ca20845c58 100644 --- a/python/samba/tests/kcc/__init__.py +++ b/python/samba/tests/kcc/__init__.py @@ -78,22 +78,13 @@ class KCCTests(samba.tests.TestCase): my_kcc = kcc.KCC(unix_now, readonly=True, verify=True, debug=False, dot_file_dir=None) - # - # The following seems to raise - # samba.kcc.graph_utils.GraphError when something - # goes wrong. - # - # Typically failureException is exceptions.AssertionError - # by default, see pydoc unittest.TestCase - # - # As this is flapping under python3, we need to - # make sure it generates a failure instead of an error. - # - # We need to make sure samba.kcc.graph_utils.GraphError - # will generate a failure from here on. - # - self.failureException = samba.kcc.graph_utils.GraphError - - my_kcc.run("ldap://%s" % os.environ["SERVER"], - self.lp, self.creds, - attempt_live_connections=False) + # As this is flapping with errors under python3, we catch + # exceptions and turn them into failures.. + try: + my_kcc.run("ldap://%s" % os.environ["SERVER"], + self.lp, self.creds, + attempt_live_connections=False) + except (samba.kcc.graph_utils.GraphError, kcc.KCCError): + import traceback + traceback.print_exc() + self.fail()