python/samba/tests: Py2/Py2 enable samba.tests.samba_tool.help to run

Ensure bytes output is converted to text type for PY3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/samba_tool/help.py b/python/samba/tests/samba_tool/help.py
index 62e0b3eaa23d7f13b657e1ed9509236e5ebfe1c6..db70f6173555d5902d216902345d10384bd641ec 100644 (file)
--- a/python/samba/tests/samba_tool/help.py
+++ b/python/samba/tests/samba_tool/help.py
@@ -20,7 +20,7 @@
 import re
 from samba.tests.samba_tool.base import SambaToolCmdTest
 from samba.tests import BlackboxProcessError
-
+from samba.compat import get_string
 
 class HelpTestCase(SambaToolCmdTest):
     """Tests for samba-tool help and --help
@@ -47,7 +47,7 @@ class HelpTestCase(SambaToolCmdTest):
                 except BlackboxProcessError as e:
                     output = e.stdout
                     failed_commands.append(c)
-
+                output = get_string(output)
                 tail = output.partition('Available subcommands:')[2]
                 subcommands = re.findall(r'^\s*([\w-]+)\s+-', tail,
                                          re.MULTILINE)
@@ -62,6 +62,7 @@ class HelpTestCase(SambaToolCmdTest):
                     output2 = e.stdout
                     failed_commands.append(c)
 
+                output2 = get_string(output2)
                 self.assertEqual(output, output2)
 
             if not new_commands: