python: tests: Make tests of dsdb Python module Python 3 compatible

Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 791680b4ca5aad34c110fa6bfc155501be2ed481..fd9919f951469066a1b56970a7afc50be8973c8c 100644 (file)
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -64,7 +64,7 @@ class DsdbTests(TestCase):
                                 base=self.account_dn,
                                 attrs=["replPropertyMetaData"])
         repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                            str(res[0]["replPropertyMetaData"]))
+                          res[0]["replPropertyMetaData"][0])
         ctr = repl.ctr
         for o in ctr.array:
             # Search for Description
@@ -82,7 +82,7 @@ class DsdbTests(TestCase):
                                 base=self.account_dn,
                                 attrs=["replPropertyMetaData"])
         repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                            str(res[0]["replPropertyMetaData"]))
+                          res[0]["replPropertyMetaData"][0])
         replBlob = ndr_pack(repl)
         msg = ldb.Message()
         msg.dn = res[0].dn
@@ -94,7 +94,7 @@ class DsdbTests(TestCase):
                                 base=self.account_dn,
                                 attrs=["replPropertyMetaData"])
         repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                            str(res[0]["replPropertyMetaData"]))
+                          res[0]["replPropertyMetaData"][0])
         replBlob = ndr_pack(repl)
         msg = ldb.Message()
         msg.dn = res[0].dn
@@ -106,14 +106,14 @@ class DsdbTests(TestCase):
                                 base=self.account_dn,
                                 attrs=["replPropertyMetaData", "uSNChanged"])
         repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                            str(res[0]["replPropertyMetaData"]))
+                          res[0]["replPropertyMetaData"][0])
         ctr = repl.ctr
         for o in ctr.array:
             # Search for Description
             if o.attid == 13:
                 old_version = o.version
                 o.version = o.version + 1
-                o.local_usn = long(str(res[0]["uSNChanged"])) + 1
+                o.local_usn = int(str(res[0]["uSNChanged"])) + 1
         replBlob = ndr_pack(repl)
         msg = ldb.Message()
         msg.dn = res[0].dn
@@ -126,15 +126,15 @@ class DsdbTests(TestCase):
                                 base=self.account_dn,
                                 attrs=["replPropertyMetaData", "uSNChanged"])
         repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                            str(res[0]["replPropertyMetaData"]))
+                          res[0]["replPropertyMetaData"][0])
         ctr = repl.ctr
         for o in ctr.array:
             # Search for Description
             if o.attid == 13:
                 old_version = o.version
                 o.version = o.version + 1
-                o.local_usn = long(str(res[0]["uSNChanged"])) + 1
-                o.originating_usn = long(str(res[0]["uSNChanged"])) + 1
+                o.local_usn = int(str(res[0]["uSNChanged"])) + 1
+                o.originating_usn = int(str(res[0]["uSNChanged"])) + 1
         replBlob = ndr_pack(repl)
         msg = ldb.Message()
         msg.dn = res[0].dn
@@ -183,7 +183,8 @@ class DsdbTests(TestCase):
                                     controls=["local_oid:%s:1"
                                               % dsdb.DSDB_CONTROL_INVALID_NOT_IMPLEMENTED])
         except ldb.LdbError as e:
-            if e[0] != ldb.ERR_UNSUPPORTED_CRITICAL_EXTENSION:
+            (errno, estr) = e.args
+            if errno != ldb.ERR_UNSUPPORTED_CRITICAL_EXTENSION:
                 self.fail("Got %s should have got ERR_UNSUPPORTED_CRITICAL_EXTENSION"
                           % e[1])
 
@@ -227,7 +228,7 @@ class DsdbTests(TestCase):
                 "dn": dn,
                 "objectClass": "foreignSecurityPrincipal"})
         except ldb.LdbError as e:
-            (code, msg) = e
+            (code, msg) = e.args
             self.fail("Got unexpected exception %d - %s "
                       % (code, msg))
 
@@ -262,7 +263,7 @@ class DsdbTests(TestCase):
                 "objectSID": sid})
             self.fail("No exception should get LDB_ERR_CONSTRAINT_VIOLATION")
         except ldb.LdbError as e:
-            (code, msg) = e
+            (code, msg) = e.args
             if code != ldb.ERR_CONSTRAINT_VIOLATION:
                 self.fail("Got %d - %s should have got "
                           "LDB_ERR_CONSTRAINT_VIOLATION"

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index de0bbeadc08d491e7b0789f05757f91aff0c4e7d..c64101ff46305ec521857668af61ebebba001cb4 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -577,7 +577,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
 planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
 planoldpythontestsuite("none", "simple", extra_path=["%s/lib/tdb/python/tests" % srcdir()], name="tdb.python")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.sam")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dsdb")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dsdb", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.dsdb_lock")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.bare")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.unix")