From: Noel Power Date: Tue, 11 Sep 2018 12:21:18 +0000 (+0100) Subject: s4/torture/drs: PY3 fix error with test_samba_tool_showrepl_json X-Git-Tag: tdb-1.3.17~1592 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0b187982f2c02eda0860c677c98a38293dee988;p=thirdparty%2Fsamba.git s4/torture/drs: PY3 fix error with test_samba_tool_showrepl_json some versions of json.loads appear to need to be passed string. Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/source4/torture/drs/python/samba_tool_drs_showrepl.py b/source4/torture/drs/python/samba_tool_drs_showrepl.py index 0fe2c60e940..3a9d18afd41 100644 --- a/source4/torture/drs/python/samba_tool_drs_showrepl.py +++ b/source4/torture/drs/python/samba_tool_drs_showrepl.py @@ -127,8 +127,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): """ out = self.check_output("samba-tool drs showrepl %s %s --json" % (self.dc1, self.cmdline_creds)) - - d = json.loads(out) + d = json.loads(get_string(out)) self.assertEqual(set(d), set(['repsFrom', 'repsTo', "NTDSConnections",