summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2018-06-15 10:12:26 +0100
committerAndrew Bartlett <abartlet@samba.org>2018-09-15 15:18:29 +0200
commit4de325760f330ed7add4789900f9f67c6ee7d5fd (patch)
tree02d5827ec7f63498727a06fe70537c7bf2130cbf /source4
parenta299ff58864d97ea7450cbf2019c5a1637142b9d (diff)
downloadsamba-4de325760f330ed7add4789900f9f67c6ee7d5fd.tar.gz
s4/torture/drs: py2/py3 compat for test samba4.drs.repl_move
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/drs/python/repl_move.py16
1 files changed, 8 insertions, 8 deletions
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