diff options
| author | Noel Power <noel.power@suse.com> | 2018-10-10 17:35:53 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-11-14 05:07:16 +0100 |
| commit | b16043f57d5e0b9a769de61d512c6e01c5e05a7d (patch) | |
| tree | 47ee06962d1532201cc6cc78db8b279d1f1435c0 /python | |
| parent | 108109360a5b8ca45b8bf0eef020fe001af61d1d (diff) | |
| download | samba-b16043f57d5e0b9a769de61d512c6e01c5e05a7d.tar.gz | |
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>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/blackbox/netads_json.py | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |