summaryrefslogtreecommitdiff
path: root/python/samba/tests
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2018-03-08 14:29:40 +1300
committerAndrew Bartlett <abartlet@samba.org>2018-05-31 01:57:15 +0200
commit9f52c19b807e4961a76fa652aa5b7f660625e65e (patch)
tree334d91f0140f15e2108f3b7046d11c9805c1a42c /python/samba/tests
parentbdc0681eaebab7bc930206c2d2db68d7ca132ad3 (diff)
downloadsamba-9f52c19b807e4961a76fa652aa5b7f660625e65e.tar.gz
samba-9f52c19b807e4961a76fa652aa5b7f660625e65e.tar.bz2
samba-9f52c19b807e4961a76fa652aa5b7f660625e65e.zip
samba-tool viusalize: mark RODCs in distance matrix
RODCs should not be replicating out, which means they look alarming when they are working properly. We label them as RODCs to reminds users that no outbound replication is expected. This results in slightly rejigged output formatting. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/tests')
-rw-r--r--python/samba/tests/samba_tool/visualize.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/samba/tests/samba_tool/visualize.py b/python/samba/tests/samba_tool/visualize.py
index 1afb210b7bd..43757e7b497 100644
--- a/python/samba/tests/samba_tool/visualize.py
+++ b/python/samba/tests/samba_tool/visualize.py
@@ -71,11 +71,12 @@ def samdb_from_ldif(ldif, tempdir, lp, dsa=None, tag=''):
return (samdb, dburl)
-def collapse_space(s):
+def collapse_space(s, keep_empty_lines=False):
lines = []
for line in s.splitlines():
line = ' '.join(line.strip().split())
- lines.append(line)
+ if line or keep_empty_lines:
+ lines.append(line)
return '\n'.join(lines)
@@ -453,6 +454,7 @@ key_0__label -> elision0 [style=invis; weight=9]
EXPECTED_DISTANCE_GRAPH_WITH_KEY = """
NTDS Connections known to CN=LOCALDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com
+
destination
,-------- *,CN=CLIENT+
|,------- *,CN=LOCALDC+