s4/torture/drs/python: make test code run in py2/py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py
index 2b18853780d75c4ce3904d31f8cd015ac6f634ee..af809a610dd9372dc24dc63f38ef48a77eaeb58f 100644 (file)
--- a/source4/torture/drs/python/drs_base.py
+++ b/source4/torture/drs/python/drs_base.py
@@ -40,6 +40,7 @@ from ldb import (
     FLAG_MOD_REPLACE,
 )
 from samba.compat import cmp_fn
+from samba.compat import get_string
 
 
 class DrsBaseTestCase(SambaToolCmdTest):
@@ -84,7 +85,7 @@ class DrsBaseTestCase(SambaToolCmdTest):
         self.test_ldb_dc = ldb_dc
 
     def _GUID_string(self, guid):
-        return self.test_ldb_dc.schema_format_value("objectGUID", guid)
+        return get_string(self.test_ldb_dc.schema_format_value("objectGUID", guid))
 
     def _ldap_schemaUpdateNow(self, sam_db):
         rec = {"dn": "",

diff --git a/source4/torture/drs/python/replica_sync.py b/source4/torture/drs/python/replica_sync.py
index 2c881d3e853b273c18025da4821ca045479804fb..20b1c905c45d51017d98c7de184266ce710e750b 100644 (file)
--- a/source4/torture/drs/python/replica_sync.py
+++ b/source4/torture/drs/python/replica_sync.py
@@ -139,8 +139,8 @@ objectClass: organizationalUnit
         dodn = self._deleted_objects_dn(sam_ldb)
         # now check properties of the user
         name_cur = ou_cur["ou"][0]
-        self.assertEquals(ou_cur["isDeleted"][0], "TRUE")
-        self.assertTrue(not("objectCategory" in ou_cur))
+        self.assertEquals(ou_cur["isDeleted"][0], b"TRUE")
+        self.assertTrue(not(b"objectCategory" in ou_cur))
         self.assertTrue(dodn in str(ou_cur["dn"]),
                         "OU %s is deleted but it is not located under %s!" % (name_cur, dodn))
 
@@ -636,9 +636,9 @@ objectClass: organizationalUnit
         print(res1[0].dn)
         print(res2[0].dn)
         print(res3[0].dn)
-        self.assertEqual('Test Child 2', res1[0]["name"][0])
-        self.assertEqual('Test Child', res2[0]["name"][0])
-        self.assertEqual('Test CASE Child', res3[0]["name"][0])
+        self.assertEqual('Test Child 2', str(res1[0]["name"][0]))
+        self.assertEqual('Test Child', str(res2[0]["name"][0]))
+        self.assertEqual('Test CASE Child', str(res3[0]["name"][0]))
         self.assertEqual(str(res1[0].dn), "OU=Test Child 2,OU=Original parent 3,%s" % self.top_ou)
         self.assertEqual(str(res2[0].dn), "OU=Test Child,OU=Original parent 3,%s" % self.top_ou)
         self.assertEqual(str(res3[0].dn), "OU=Test CASE Child,OU=Original parent 2,%s" % self.top_ou)
@@ -656,9 +656,9 @@ objectClass: organizationalUnit
         print(res1[0].dn)
         print(res2[0].dn)
         print(res3[0].dn)
-        self.assertEqual('Test Child 2', res1[0]["name"][0])
-        self.assertEqual('Test Child', res2[0]["name"][0])
-        self.assertEqual('Test CASE Child', res3[0]["name"][0])
+        self.assertEqual('Test Child 2', str(res1[0]["name"][0]))
+        self.assertEqual('Test Child', str(res2[0]["name"][0]))
+        self.assertEqual('Test CASE Child', str(res3[0]["name"][0]))
         self.assertEqual(str(res1[0].dn), "OU=Test Child 2,OU=Original parent 3,%s" % self.top_ou)
         self.assertEqual(str(res2[0].dn), "OU=Test Child,OU=Original parent 3,%s" % self.top_ou)
         self.assertEqual(str(res3[0].dn), "OU=Test CASE Child,OU=Original parent 2,%s" % self.top_ou)