s4/selftest: enable samba.tests.samba_tool.user_wdigest for python3

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

diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 0d13b30a3c96847db3295dc32275a27cbb8d306d..640d478c813eb849bfaba282fc89b4a42c550fb7 100644 (file)
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -56,6 +56,7 @@ from samba.netcmd import (
 )
 from samba.compat import text_type
 from samba.compat import get_bytes
+from samba.compat import get_string
 
 try:
     import io
@@ -1169,7 +1170,7 @@ class GetPasswordCommand(Command):
                                  primary_wdigest)
             try:
                 digest = binascii.hexlify(bytearray(digests.hashes[i - 1].hash))
-                return "%s:%s:%s" % (user, realm, text_type(digest, 'utf8'))
+                return "%s:%s:%s" % (user, realm, get_string(digest))
             except IndexError:
                 return None
 

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index a353ffa5c1503b5852592f8ea0f909689f219aea..4cf6acdfb575572ab8fbef68102cba99cbc016b9 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -632,7 +632,7 @@ planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.gpo")
 
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.processes", py3_compatible=True)
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.user")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.user_wdigest")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.user_wdigest",  py3_compatible=True)
 planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.user")
 planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.user_virtualCryptSHA")
 planpythontestsuite("chgdcpass:local", "samba.tests.samba_tool.user_check_password_script")