[PATCH] mark tombstone_reanimation patch flapping
obnox at samba.org
Fri Mar 20 03:03:44 MDT 2015
On 2015-03-20 at 21:50 +1300, Andrew Bartlett wrote:
> On Fri, 2015-03-20 at 08:40 +0100, Michael Adam wrote:
> > On 2015-03-20 at 15:42 +1300, Andrew Bartlett wrote:
> > >
> > > Please review/push this patch, and help me understand how I can get this
> > > test off the flapping list, so we can consider the tombstone reanimation
> > > patches for 4.2.
> > Comment inline...
> > > From 6f1a0d8aa96c1d3663083e001e487e84f4f34714 Mon Sep 17 00:00:00 2001
> > > From: Andrew Bartlett <abartlet at samba.org>
> > > Date: Thu, 19 Mar 2015 18:35:05 +1300
> > > Subject: [PATCH] dsdb-tests: Give more helpful information about attribute
> > > differences
> > >
> > > Signed-off-by: Andrew Bartlett <abartlet at samba.org>
> > > ---
> > > source4/dsdb/tests/python/tombstone_reanimation.py | 4 +++-
> > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py
> > > index ad780fd..af676fa 100644
> > > --- a/source4/dsdb/tests/python/tombstone_reanimation.py
> > > +++ b/source4/dsdb/tests/python/tombstone_reanimation.py
> > > @@ -83,7 +83,9 @@ class RestoredObjectAttributesBaseTestCase(samba.tests.TestCase):
> > > return self.search_dn(msg['dn'])
> > >
> > > def assertAttributesEqual(self, obj_orig, attrs_orig, obj_restored, attrs_rest):
> > > - self.assertEqual(attrs_orig, attrs_rest, "Actual object does not have expected attributes")
> > > + self.assertEqual(attrs_orig, attrs_rest,
> > > + "Actual object does not have expected attributes, missing from expected (%s), extra (%s)"
> > > + % (str(attrs_orig.difference(attrs_rest)), str(attrs_rest.difference(attrs_orig))))
> > Uncertain: Is the order of arguments correct?
> > Otherwise looks good. Will push after clarification.
> I'm not sure, I think they might be - my mind bends each time I read the
> Python docs on this.
Err, my question was actually more superficial.
And I somehow misread the line. This looks correct!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 198 bytes
Desc: not available
More information about the samba-technical