From: Noel Power Date: Thu, 31 May 2018 15:13:28 +0000 (+0100) Subject: s4/dsdb/tests/python: base64.b64encode returns bytes X-Git-Tag: ldb-1.5.0~292 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a2c22136ba63eb994faa6b2eeda342dd5491d49;p=thirdparty%2Fsamba.git s4/dsdb/tests/python: base64.b64encode returns bytes adjust to unicode for py2/py3 compat needed as part of changes to ensure samba4.ldap.password_settings will work with PY3 Signed-off-by: Noel Power Reviewed-by: Andreas Schneider Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall --- diff --git a/source4/dsdb/tests/python/password_settings.py b/source4/dsdb/tests/python/password_settings.py index 12779a033c6..9bd536592af 100644 --- a/source4/dsdb/tests/python/password_settings.py +++ b/source4/dsdb/tests/python/password_settings.py @@ -727,7 +727,7 @@ class PasswordSettingsTestCase(PasswordTestCase): # defaults, to prove that the DC will reject bad passwords during a # user add userdn = "CN=testuser,%s" % self.ou - password = base64.b64encode("\"abcdef\"".encode('utf-16-le')) + password = base64.b64encode('"abcdef"'.encode('utf-16-le')).decode('utf8') # Note we use an LDIF operation to ensure that the password gets set # as part of the 'add' operation (whereas self.add_user() adds the user @@ -751,7 +751,7 @@ unicodePwd:: %s # now use a password that meets the domain defaults, but doesn't meet # the PSO requirements. Note that Windows allows this, i.e. it doesn't # honour the PSO during the add operation - password = base64.b64encode("\"abcde12#\"".encode('utf-16-le')) + password = base64.b64encode('"abcde12#"'.encode('utf-16-le')).decode('utf8') ldif = """ dn: %s objectClass: user @@ -787,7 +787,7 @@ unicodePwd:: %s self.assertTrue('0000052D' in msg, msg) # check setting a password that meets the PSO settings works - password = base64.b64encode("\"abcdefghijkl\"".encode('utf-16-le')) + password = base64.b64encode('"abcdefghijkl"'.encode('utf-16-le')).decode('utf8') ldif = """ dn: %s changetype: modify