python/samba/tests: PY3 port samba.tests.blackbox.netads_json
authorNoel Power <noel.power@suse.com>
Wed, 10 Oct 2018 16:35:53 +0000 (17:35 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 14 Nov 2018 04:07:16 +0000 (05:07 +0100)
convert output from check_output to text
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/blackbox/netads_json.py

index ce48a2bf0621ac540e7664e370004f44ee288412..f904a82dfa2cc562a2c4551531f026db0eba08c1 100644 (file)
@@ -19,6 +19,7 @@ import json
 import re
 
 import samba.tests
+from samba.compat import get_string
 
 COMMAND         = "bin/net ads"
 # extract keys from non-json version
@@ -56,7 +57,7 @@ class BaseWrapper (object):
             """
             argv = "%s %s" % (COMMAND, self.subcmd)
             try:
-                out_plain = self.check_output(argv)
+                out_plain = get_string(self.check_output(argv))
             except samba.tests.BlackboxProcessError as e:
                 self.fail("Error calling [%s]: %s" % (argv, e))