PY3: wrap filter calls with list where list is expected

filter in PY2 returns list in PY3 it returns an iterator

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

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index ab34563cc48db54dc5542b17e84a97627a35d767..7d469e3f35af284a2f180051ade4d8dd415fbc90 100644 (file)
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -187,7 +187,7 @@ def plansmbtorture4testsuite(name, env, options, target, modname=None):
 
 
 def smbtorture4_testsuites(prefix):
-    return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
+    return list(filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list))
 
 
 smbclient3 = binpath('smbclient')

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index be3ee689608e8e743fb1ce101fb2499fa40afae2..18037524627f480ee30b77c4e26efe858f1c0e2b 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -323,7 +323,7 @@ smb2_s3only = [
 smb2 = [x for x in smbtorture4_testsuites("smb2.") if x not in smb2_s3only]
 
 # The QFILEINFO-IPC test needs to be on ipc$
-raw = filter(lambda x: "raw.qfileinfo.ipc" not in x, smbtorture4_testsuites("raw."))
+raw = list(filter(lambda x: "raw.qfileinfo.ipc" not in x, smbtorture4_testsuites("raw.")))
 base = smbtorture4_testsuites("base.")
 
 netapi = smbtorture4_testsuites("netapi.")