python selftest: enable samba.tests.s3param to run with python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py
index 8df017054974cf5158795a91bb2aef8223323cf1..ff28da49881f91770686a71f0251f3fcdb87801b 100644 (file)
--- a/python/samba/samba3/__init__.py
+++ b/python/samba/samba3/__init__.py
@@ -26,9 +26,8 @@ import os
 import struct
 import tdb
 
-import passdb
-import param as s3param
-
+import samba.samba3.passdb
+from samba.samba3 import param as s3param
 
 def fetch_uint32(db, key):
     try:

diff --git a/selftest/tests.py b/selftest/tests.py
index 027a80e03f18ab90003899577f9a1ddadede92c0..7b81900e521bfdc00cd9ff13c3508fba32239651 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -75,7 +75,7 @@ planpythontestsuite("none", "samba.tests.dcerpc.string")
 planpythontestsuite("none", "samba.tests.hostconfig")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.messaging",
                     py3_compatible=True)
-planpythontestsuite("none", "samba.tests.s3param")
+planpythontestsuite("none", "samba.tests.s3param", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.s3passdb")
 planpythontestsuite("none", "samba.tests.s3registry")
 planpythontestsuite("none", "samba.tests.s3windb")