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 d81bafe52bac95c49ccd9691ccd5c22d70c7890b..71965799b44558bc5e8fd0fe59962f32d2507f1d 100644 (file)
--- 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 (file)
index e92dd83..0000000
--- 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