[PATCH] improve a selftest error message

Volker Lendecke Volker.Lendecke at SerNet.DE
Thu Jan 10 19:44:14 UTC 2019


On Fri, Jan 11, 2019 at 08:14:04AM +1300, Douglas Bagnall via samba-technical wrote:
> 
> 
> > 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.

Sure, thanks!

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: 0551-370000-0, mailto:kontakt at sernet.de
Gesch.F.: Dr. Johannes Loxen und Reinhild Jung
AG Göttingen: HR-B 2816 - http://www.sernet.de



More information about the samba-technical mailing list