]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4/torture/drs: py2/py3 compat for test samba4.drs.repl_move
authorNoel Power <noel.power@suse.com>
Fri, 15 Jun 2018 09:12:26 +0000 (10:12 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 15 Sep 2018 13:18:29 +0000 (15:18 +0200)
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/torture/drs/python/repl_move.py

index fed97518560bd096f691a27435b18c9fd6558e52..3f4957281ab9988714a48139a75007f8426b51bb 100644 (file)
@@ -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