kcc graph verifier: use __doc__ description for error explanation

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/kcc/graph.py b/python/samba/kcc/graph.py
index 1e63f7c7629c02b29a4a88d1fb42a67e1e48f761..d87530d40c3616859a969b1d0b5c344fe7f087ee 100644 (file)
--- a/python/samba/kcc/graph.py
+++ b/python/samba/kcc/graph.py
@@ -188,7 +188,7 @@ def get_spanning_tree_edges(graph, my_site, label=None, verify=False,
                                       properties=('complete', 'connected'))
                 if errors:
                     DEBUG('spanning tree edge set %s FAILED' % edgeType)
-                    for p, e in errors:
+                    for p, e, doc in errors:
                         DEBUG("%18s: %s" % (p, e))
                     raise KCCError("spanning tree failed")
 

diff --git a/python/samba/kcc/graph_utils.py b/python/samba/kcc/graph_utils.py
index e4fa821c79866a4623c116448b44fdc8ee869ffc..291fd4864242f2f8ff7cb3e9628ffac08c0b714f 100644 (file)
--- a/python/samba/kcc/graph_utils.py
+++ b/python/samba/kcc/graph_utils.py
@@ -294,7 +294,7 @@ def verify_graph(edges, vertices=None, directed=False, properties=()):
         try:
             f(edges, vertices, edge_vertices)
         except GraphError as e:
-            errors.append((p, e))
+            errors.append((p, e, f.__doc__))
 
     return errors
 
@@ -319,13 +319,13 @@ def verify_and_dot(basename, edges, vertices=None, label=None,
         if errors:
             title = '%s %s' % (basename, label or '')
             debug(("%s%s%s FAILED:" % (MAGENTA, title, RED)))
-            for p, e in errors:
+            for p, e, doc in errors:
                 debug(" %18s: %s%s%s" % (p, DARK_YELLOW, e, RED))
             if fatal:
                 raise GraphError("The '%s' graph lacks the following "
                                  "properties:\n%s" %
-                                 (title, '\n'.join('%s: %s' % x
-                                                   for x in errors)))
+                                 (title, '\n'.join('%s: %s' % (p, e)
+                                                   for p, e, doc in errors)))
 
 
 def list_verify_tests():