From e4779b0da3140e0a9777a39b82222cd1a8102780 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 22 Mar 2018 12:21:12 +0000 Subject: [PATCH] python selftest: enable samba.tests.s3param to run with python3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- python/samba/samba3/__init__.py | 5 ++--- selftest/tests.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py index 8df017054974..ff28da49881f 100644 --- 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 027a80e03f18..7b81900e521b 100644 --- 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") -- 2.34.1