From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Tue, 16 Aug 2022 23:51:40 +0000 (+1200)
Subject: samba-tool visualize: respect $NO_COLOR
X-Git-Tag: talloc-2.4.0~1194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ced3d21513907dee7da6c0f7a4bd345120b439d;p=thirdparty%2Fsamba.git

samba-tool visualize: respect $NO_COLOR

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

diff --git a/python/samba/netcmd/visualize.py b/python/samba/netcmd/visualize.py
index d81bafe52ba..71965799b44 100644
--- a/python/samba/netcmd/visualize.py
+++ b/python/samba/netcmd/visualize.py
@@ -158,6 +158,8 @@ class GraphCommand(Command):
             return None
 
         if color == 'auto':
+            if os.environ.get('NO_COLOR'):
+                return None
             if isinstance(output, str) and output != '-':
                 return None
             if not hasattr(self.outf, 'isatty'):
diff --git a/selftest/knownfail.d/samba-tool-visualize b/selftest/knownfail.d/samba-tool-visualize
deleted file mode 100644
index e92dd83a8fb..00000000000
--- a/selftest/knownfail.d/samba-tool-visualize
+++ /dev/null
@@ -1 +0,0 @@
-samba.tests.samba_tool.visualize.samba.tests.samba_tool.visualize.SambaToolVisualizeLdif.test_colour_auto_tty