From: Noel Power Date: Fri, 15 Jun 2018 09:12:26 +0000 (+0100) Subject: s4/torture/drs: py2/py3 compat for test samba4.drs.repl_move X-Git-Tag: tdb-1.3.17~1582 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de325760f330ed7add4789900f9f67c6ee7d5fd;p=thirdparty%2Fsamba.git s4/torture/drs: py2/py3 compat for test samba4.drs.repl_move Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/source4/torture/drs/python/repl_move.py b/source4/torture/drs/python/repl_move.py index fed97518560..3f4957281ab 100644 --- a/source4/torture/drs/python/repl_move.py +++ b/source4/torture/drs/python/repl_move.py @@ -217,10 +217,10 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase): "replPropertyMetaData"]) self.assertEquals(len(res), 1) user_cur = res[0] - rdn_orig = obj_orig[user_cur.dn.get_rdn_name()][0] - rdn_cur = user_cur[user_cur.dn.get_rdn_name()][0] - name_orig = obj_orig["name"][0] - name_cur = user_cur["name"][0] + rdn_orig = str(obj_orig[user_cur.dn.get_rdn_name()][0]) + rdn_cur = str(user_cur[user_cur.dn.get_rdn_name()][0]) + name_orig = str(obj_orig["name"][0]) + name_cur = str(user_cur["name"][0]) dn_orig = obj_orig["dn"] dn_cur = user_cur["dn"] # now check properties of the user @@ -1913,10 +1913,10 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase): attrs=["*", "parentGUID"]) self.assertEquals(len(res), 1) user_cur = res[0] - cn_orig = obj_orig["cn"][0] - cn_cur = user_cur["cn"][0] - name_orig = obj_orig["name"][0] - name_cur = user_cur["name"][0] + cn_orig = str(obj_orig["cn"][0]) + cn_cur = str(user_cur["cn"][0]) + name_orig = str(obj_orig["name"][0]) + name_cur = str(user_cur["name"][0]) dn_orig = obj_orig["dn"] dn_cur = user_cur["dn"] # now check properties of the user