From: Noel Power <noel.power@suse.com>
Date: Wed, 10 Oct 2018 16:35:53 +0000 (+0100)
Subject: python/samba/tests: PY3 port samba.tests.blackbox.netads_json
X-Git-Tag: tdb-1.3.17~774
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b16043f57d5e0b9a769de61d512c6e01c5e05a7d;p=thirdparty%2Fsamba.git

python/samba/tests: PY3 port samba.tests.blackbox.netads_json

convert output from check_output to text
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/blackbox/netads_json.py b/python/samba/tests/blackbox/netads_json.py
index ce48a2bf062..f904a82dfa2 100644
--- a/python/samba/tests/blackbox/netads_json.py
+++ b/python/samba/tests/blackbox/netads_json.py
@@ -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))