[PATCH] improve a selftest error message
Douglas Bagnall
douglas.bagnall at catalyst.net.nz
Thu Jan 10 19:14:04 UTC 2019
> diff --git a/python/samba/tests/getdcname.py b/python/samba/tests/getdcname.py
> index de3fd3df5e0..2cf7d252783 100644
> --- a/python/samba/tests/getdcname.py
> +++ b/python/samba/tests/getdcname.py
> @@ -275,7 +275,8 @@ class GetDCNameEx(samba.tests.TestCase):
> flags=netlogon.DS_RETURN_DNS_NAME,
> ex2=False)
> except WERRORError as e:
> - self.fail("Failed to succeed over winbind: " + str(e))
> + self.fail(("get_dc_name (domain=%s,site=%s) over winbind failed: "
> + + str(e)) % (self.trust_domain, site))
This won't work very well if str(e) contains a '%' (which seems unlikely with WERRORError,
but still). It would be a bit better like this:
+ self.fail("get_dc_name (domain=%s,site=%s) over winbind failed: %s"
+ % (self.trust_domain, site, e))
which I'll push if you agree.
Douglas
More information about the samba-technical
mailing list