From: Tim Beale Date: Tue, 20 Nov 2018 04:15:41 +0000 (+1300) Subject: tests: Add better error for DRS tests X-Git-Tag: tdb-1.3.17~662 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8ff4a0881bd6a12ba43ece27b8d3d9e5750b81f;p=thirdparty%2Fsamba.git tests: Add better error for DRS tests We've got a flappy test hitting this assertion failure, but we can't tell why it's failing intermittently (probably because we're bumping the RID-Set, but there's no way to confirm this). Add some extra debug info if the test assertion fails. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett --- diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py index 2e8598d529b..77abd439794 100644 --- a/source4/torture/drs/python/drs_base.py +++ b/source4/torture/drs/python/drs_base.py @@ -384,15 +384,15 @@ class DrsBaseTestCase(SambaToolCmdTest): """ Check that a ctr6 matches the specified parameters. """ - self.assertEqual(ctr6.object_count, len(expected_dns)) + ctr6_dns = self._get_ctr6_dn_list(ctr6) + self.assertEqual(ctr6.object_count, len(expected_dns), + "Received unexpected objects (%s)" % ctr6_dns) self.assertEqual(ctr6.linked_attributes_count, len(expected_links)) self.assertEqual(ctr6.more_data, more_data) self.assertEqual(ctr6.nc_object_count, nc_object_count) self.assertEqual(ctr6.nc_linked_attributes_count, nc_linked_attributes_count) self.assertEqual(ctr6.drs_error[0], drs_error) - ctr6_dns = self._get_ctr6_dn_list(ctr6) - i = 0 for dn in expected_dns: # Expect them back in the exact same order as specified.