sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-18 08:23:51 +03:00
Code Activity

netcmd: tests: make _run a classmethod in SambaToolCmdTest

Browse Source 
So that it can be called from setUpClass as well

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Rob van der Linde
2023-09-27 00:01:06 +13:00
committed by Andrew Bartlett
parent 71c191ca9f
commit 16c19c470e
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/tests/samba_tool/visualize.py
View File

@@ -150,9 +150,10 @@ class SambaToolVisualizeLdif(SambaToolCmdTest):
'--color=no', '-S')
self.assertCmdSuccess(result, monochrome, err)
self.assert_colour(monochrome, False)
cls = self.__class__
try:
self.stringIO = StringIOThinksItIsATTY
cls.stringIO = StringIOThinksItIsATTY
old_no_color = os.environ.pop('NO_COLOR', None)
# First with no NO_COLOR env var. There should be colour.
result, out, err = self.runsubcmd("visualize", "ntdsconn",
@@ -204,7 +205,7 @@ class SambaToolVisualizeLdif(SambaToolCmdTest):
self.assert_colour(out, is_colour, monochrome)
finally:
self.stringIO = StringIO
cls.stringIO = StringIO
if old_no_color is None:
os.environ.pop('NO_COLOR', None)
else: