diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-19 18:07:16 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:23 +0100 |
| commit | 42cb270b48f11c8ac8104125acd2719f307c4a39 (patch) | |
| tree | 5ef2cb9174955be269a6af64e9e8235c8a886a71 /lib/ldb-samba | |
| parent | 60a9998ea3de19f88e281a35aff19b17be55a872 (diff) | |
| download | samba-42cb270b48f11c8ac8104125acd2719f307c4a39.tar.gz | |
lib/ldb-samba/tests: PY3 port samba4.ldap.match_rules
Various fixes
a) schema_format_value can return bytes (esp. for objectSid,
objectGUID
b) embedded NULL now cause ValueError in py3 (was TypeError in py2)
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/ldb-samba')
| -rwxr-xr-x | lib/ldb-samba/tests/match_rules.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/ldb-samba/tests/match_rules.py b/lib/ldb-samba/tests/match_rules.py index ad8ed3168e4..13561b174e9 100755 --- a/lib/ldb-samba/tests/match_rules.py +++ b/lib/ldb-samba/tests/match_rules.py @@ -430,8 +430,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("cn=u1,%s" % self.ou_users).lower()) - sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]) - guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]) + sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]).decode('utf8') + guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]).decode('utf8') res1 = self.ldb.search(self.ou_groups, scope=SCOPE_SUBTREE, @@ -493,8 +493,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("cn=u2,%s" % self.ou_users).lower()) - sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]) - guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]) + sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]).decode('utf8') + guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]).decode('utf8') res1 = self.ldb.search(self.ou_groups, scope=SCOPE_SUBTREE, @@ -552,8 +552,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("cn=u3,%s" % self.ou_users).lower()) - sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]) - guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]) + sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]).decode('utf8') + guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]).decode('utf8') res1 = self.ldb.search(self.ou_groups, scope=SCOPE_SUBTREE, @@ -607,8 +607,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("cn=u4,%s" % self.ou_users).lower()) - sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]) - guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]) + sid = self.ldb.schema_format_value("objectSid", res1[0]["objectSid"][0]).decode('utf8') + guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]).decode('utf8') res1 = self.ldb.search(self.ou_groups, scope=SCOPE_SUBTREE, @@ -767,15 +767,15 @@ class MatchRulesTests(samba.tests.TestCase): self.assertEqual(len(res1), 0) def test_nul_text(self): - self.assertRaises(TypeError, + self.assertRaises((ValueError,TypeError), lambda: self.ldb.search("cn=g4,%s" % self.ou_groups, scope=SCOPE_BASE, expression="\00member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users)) - self.assertRaises(TypeError, + self.assertRaises((ValueError,TypeError), lambda: self.ldb.search("cn=g4,%s" % self.ou_groups, scope=SCOPE_BASE, expression="member:1.2.840\00.113556.1.4.1941:=cn=u1,%s" % self.ou_users)) - self.assertRaises(TypeError, + self.assertRaises((ValueError,TypeError), lambda: self.ldb.search("cn=g4,%s" % self.ou_groups, scope=SCOPE_BASE, expression="member:1.2.840.113556.1.4.1941:=cn=u1\00,%s" % self.ou_users)) |