diff options
| author | Lumir Balhar <lbalhar@redhat.com> | 2018-01-30 18:55:12 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-02-15 00:18:29 +0100 |
| commit | 70a85c163ff7397075bf0cef8a483df4f33799b4 (patch) | |
| tree | 92f41f8062f637250ee0e74344b50bbc4e1c0296 /python | |
| parent | dce18a079e8c1e259bab4b4da57121d6ab4b7635 (diff) | |
| download | samba-70a85c163ff7397075bf0cef8a483df4f33799b4.tar.gz | |
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>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/dsdb.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py index 791680b4ca5..fd9919f9514 100644 --- 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" |