selftest: enable py3 for samba.tests.dcerpc.sam

1. Fix invalid declaration syntax for toArray
2. Simplify toArray implementation with list comprehension.
3. Remove ending L for long integer.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/tests/dcerpc/sam.py b/python/samba/tests/dcerpc/sam.py
index 1c48d7e817072b256223638b3d3d242c3aba82c2..d42c4f797fad69ee5bb50749e9a6fa2b57a6264e 100644 (file)
--- a/python/samba/tests/dcerpc/sam.py
+++ b/python/samba/tests/dcerpc/sam.py
@@ -22,12 +22,10 @@
 from samba.dcerpc import samr, security
 from samba.tests import RpcInterfaceTestCase
 
+
 # FIXME: Pidl should be doing this for us
-def toArray((handle, array, num_entries)):
-    ret = []
-    for x in range(num_entries):
-        ret.append((array.entries[x].idx, array.entries[x].name))
-    return ret
+def toArray(handle, array, num_entries):
+    return [(entry.idx, entry.name) for entry in array.entries[:num_entries]]
 
 
 class SamrTests(RpcInterfaceTestCase):
@@ -45,6 +43,6 @@ class SamrTests(RpcInterfaceTestCase):
 
     def test_EnumDomains(self):
         handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
-        domains = toArray(self.conn.EnumDomains(handle, 0, 4294967295L))
+        domains = toArray(*self.conn.EnumDomains(handle, 0, 4294967295))
         self.conn.Close(handle)
 

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f86623ab0b51adc3c412f4b29804a98f26ea2670..47ff7f24653db6e66441041e6e95c1ce189a047a 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -576,7 +576,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
 
 planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
 planoldpythontestsuite("none", "simple", extra_path=["%s/lib/tdb/python/tests" % srcdir()], name="tdb.python")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.sam")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.sam", py3_compatible=True)
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dsdb", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.dsdb_lock")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.bare")