[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sat Sep 15 16:11:03 UTC 2018
The branch, master has been updated
via 4038e7b s4/selftest: enable samba.tests.ntlmdisabled for py3
via 7208d4a selftest/knownfail: Add PY3 entries for samba.tests.ntlmdisabled
via d5413d5 s4/selftest: enable samba.tests.netlogonsvc for py3
via 5884ef2 s4/selftest: enable samba.tests.kcc.kcc_utils for py3
via b2665d5 s4/selftest: enable samba.tests.kcc for py3
via f18674d s4/selftetst: enable samba4.drs.cracknames for py3
via 2eac2f1 s4/selftest: enable samba.tests.join for py3
via 0fd8c69 python/samba/tests: py_gensec_update takes bytes as param
via 3451c5e s4/selftest: enable samba4.drs.repl_rodc for py3
via 0ed0c07 s4/torture/drs/python: py2/py3 compat changes for samba4.drs.repl_rodc
via bcefbbb s4/selftest: enable samba4.drs.getncchanges for py3
via 7943e53 selftest/knownfail.d: PY3 entry fro getncchanges
via 186b7ad s4/torture/drs/python: py2/py3 porting needed for samba4.drs.getncchanges
via 50c5c47 s4/selftest: enable samba4.drs.repl_schema for py3
via 9a5a2e0 s4/selftest: enable samba4.drs.link_conflicts for py3
via 71900d9 s4/torture/drs: py2/py3 compat porting for samba4.drs.link_conflicts
via 050ba20 s4/selftest: enable samba4.drs.getnc_unpriv for py3
via 30be125 s4/selftest: enable samba4.drs.getnc_exop for py3
via 4e6987e s4/torture/drs/python: ndr_unpack needs bytes samba4.drs.getnc_exop
via 40638fe s4/selftest: enable samba4.drs.repl_move for py3
via 4de3257 s4/torture/drs: py2/py3 compat for test samba4.drs.repl_move
via a299ff5 s4/selftest: enable samba4.drs.fsmo for py3
via 496fc54 s4/torture/drs: py2/py3 compat changes for test samba4.drs.fsmo
via 6db0d67 s4/selftest: enable test samba4.drs.delete_object for py2/py3
via 72497e1 s4/torture/drs: port samba4.drs.delete_object test for py2/py3
via a929554 s4/selftest: enable samba.tests.samba_tool.schema for py2/py3
via 03deaae s4/selftest: enable samba.tests.samba_tool.forest for py3
via 89f5f53 s4/selftest: samba4.drs.replica_sync.python enable for python3.
via 13dc820 s4/selftest: enable samba4.drs.samba_tool_drs_showrepl py2/py3
via 0e20bf3 selftest/knownfail.d: PY3 rule for replica_sync
via c0b1879 s4/torture/drs: PY3 fix error with test_samba_tool_showrepl_json
via 111fd45 s4/torture/drs/python: make test code run in py2/py3
via 0728cce s4/torture/drs: PY3 port for test samba_tool_drs_showrepl
via 12ff5df s4/selftest: enable samba4.drs.samba_tool_drs for py3
via 1e23962 s4/torture/drs: port samba4.drs.samba_tool_drs for py2/py3 compat
via 4deb61d s4/selftest: enable samba4.ldap.password_settings for py3
via 3530dad selftest/knownfail.d: add PY3 entry for samba4.ldap.password_settings
via 2f5db30 s4/selftest: enable samba.tests.net_join for py3
via ed1fd607 s4/selftest: enable samba.tests.net_join_no_spnego for py3
via 6941544 s4/selftest/tests.py enable samba.tests.getdcname for py3
via 8db4369 python/samba: extra ndr_unpack needs bytes function
via 7afa2d9 s4/selftest: enable samba.tests.samba_tool.passwordsetting for Py3
via 939957f python/samba/netcmd: PY3 fix test samba.tests.samba_tool.passwordsettings
via bf2c602 s4/selftest: enable samba4.drs.ridalloc_exop for python3
via fc13a12 python/samba: PY3 port for ridalloc_exop test to work
via dcbdae1 python/samba: ndr_unpack has to take bytes not string
via cea2fd6 s4/param: py2/p3 compat override_prefixmap should be string/bytes
via 6b30bcf fallout from py_dsdb_DsReplicaAttribute to -> bytes
via 5e21334 s4/dsdb: py_dsdb_DsReplicaAttribute should deal with bytes in py3
via 12949bb s4/selftest: enable samba.tests.samba_tool.rodc for PY3
via 5517d52 s4/selftest: enable samba.tests.upgradeprovisionneeddc for py3
via 181e396 python/samba/provision: PY3 port to run samba.tests.upgradeprovisionneeddc
via 18ab3ea torture: Remove unnecesssary #include <fcntl.h>
from f8df3f3 mdssvc: Move a variable declaration closer to its use
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4038e7bd8b2a8a66ae38b8c75ebf439351fc0e14
Author: Noel Power <noel.power at suse.com>
Date: Tue Jun 19 13:15:47 2018 +0100
s4/selftest: enable samba.tests.ntlmdisabled for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sat Sep 15 18:10:42 CEST 2018 on sn-devel-144
commit 7208d4a4362b050c36ab66d335cf1c7d31e7f6b6
Author: Noel Power <noel.power at suse.com>
Date: Wed Sep 12 12:46:21 2018 +0100
selftest/knownfail: Add PY3 entries for samba.tests.ntlmdisabled
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit d5413d5b6173207cbf0fb3326e8ab4567e902467
Author: Noel Power <noel.power at suse.com>
Date: Tue Jun 19 12:28:07 2018 +0100
s4/selftest: enable samba.tests.netlogonsvc for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5884ef29552c547c684fb554955b820386c2cb00
Author: Noel Power <noel.power at suse.com>
Date: Tue Jun 19 12:13:41 2018 +0100
s4/selftest: enable samba.tests.kcc.kcc_utils for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b2665d569e35957aa2433e010175ed1fe361ee7b
Author: Noel Power <noel.power at suse.com>
Date: Tue Jun 19 11:24:16 2018 +0100
s4/selftest: enable samba.tests.kcc for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f18674db3c60a08f99200f5e119e4bdd903628fb
Author: Noel Power <noel.power at suse.com>
Date: Mon Jun 18 19:04:34 2018 +0100
s4/selftetst: enable samba4.drs.cracknames for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2eac2f13bc9e2d515b98e2380bece6dd78da7749
Author: Noel Power <noel.power at suse.com>
Date: Mon Jun 18 18:45:15 2018 +0100
s4/selftest: enable samba.tests.join for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0fd8c69ec1ca470d273064f432c573d20a0dd6ba
Author: Noel Power <noel.power at suse.com>
Date: Mon Jun 18 11:55:31 2018 +0100
python/samba/tests: py_gensec_update takes bytes as param
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3451c5e7fb0becd1b01462fe7480027816a1a75e
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 17:56:13 2018 +0100
s4/selftest: enable samba4.drs.repl_rodc for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0ed0c07dd58568b7a1a757fb4eb20613002136a8
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 17:55:46 2018 +0100
s4/torture/drs/python: py2/py3 compat changes for samba4.drs.repl_rodc
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit bcefbbb3abf37a0a466b476af1762a22fb4674f8
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 16:46:55 2018 +0100
s4/selftest: enable samba4.drs.getncchanges for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7943e5326ac7390b1ffcd04056d8ff8b21e75293
Author: Noel Power <noel.power at suse.com>
Date: Tue Sep 11 20:58:12 2018 +0100
selftest/knownfail.d: PY3 entry fro getncchanges
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 186b7addb470a9268fd7d43ac6e459fc2171bd76
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 16:46:12 2018 +0100
s4/torture/drs/python: py2/py3 porting needed for samba4.drs.getncchanges
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 50c5c47aae6f2fba0c412b6752c3c17f0e34a6be
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 16:27:18 2018 +0100
s4/selftest: enable samba4.drs.repl_schema for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9a5a2e069e6c98e2b8aeb6ce6048377fc4830c54
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 15:55:59 2018 +0100
s4/selftest: enable samba4.drs.link_conflicts for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 71900d92bb167399367a1d49e6d357f6026587e5
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 15:55:15 2018 +0100
s4/torture/drs: py2/py3 compat porting for samba4.drs.link_conflicts
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 050ba20f450341f7e476c273d16a5fa465225988
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 15:20:54 2018 +0100
s4/selftest: enable samba4.drs.getnc_unpriv for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 30be125b8e6096dbb62857fc6f81857308952ae9
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 15:14:58 2018 +0100
s4/selftest: enable samba4.drs.getnc_exop for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4e6987e54d4a948503f5b5fdfa58d02d079ef21c
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 10:39:09 2018 +0100
s4/torture/drs/python: ndr_unpack needs bytes samba4.drs.getnc_exop
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 40638fe74fa3dec5de5129ee114cebbbbb05d1fb
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 10:37:12 2018 +0100
s4/selftest: enable samba4.drs.repl_move for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4de325760f330ed7add4789900f9f67c6ee7d5fd
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 10:12:26 2018 +0100
s4/torture/drs: py2/py3 compat for test samba4.drs.repl_move
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit a299ff58864d97ea7450cbf2019c5a1637142b9d
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 09:02:26 2018 +0100
s4/selftest: enable samba4.drs.fsmo for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 496fc547ae8a1cd293893416acc725128891c931
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 15 08:58:59 2018 +0100
s4/torture/drs: py2/py3 compat changes for test samba4.drs.fsmo
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6db0d67f2b948b865e37868c3c5bdb78035812e3
Author: Noel Power <noel.power at suse.com>
Date: Thu Jun 14 17:12:54 2018 +0100
s4/selftest: enable test samba4.drs.delete_object for py2/py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 72497e1f9dc9a4bb15e392325ada14359f3f86df
Author: Noel Power <noel.power at suse.com>
Date: Thu Jun 14 17:12:30 2018 +0100
s4/torture/drs: port samba4.drs.delete_object test for py2/py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit a9295541148f3606a3e814eb761abd51f820a677
Author: Noel Power <noel.power at suse.com>
Date: Thu Jun 14 16:49:52 2018 +0100
s4/selftest: enable samba.tests.samba_tool.schema for py2/py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 03deaae2fcfecb70a9a859f700783805816cc603
Author: Noel Power <noel.power at suse.com>
Date: Wed Jun 13 17:21:13 2018 +0100
s4/selftest: enable samba.tests.samba_tool.forest for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 89f5f53f568c931a6fdf4df5c5c9f05e09172266
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 8 10:36:02 2018 +0100
s4/selftest: samba4.drs.replica_sync.python enable for python3.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 13dc820cb94ff12eb91de3335d06e8df3334e83c
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 8 09:50:45 2018 +0100
s4/selftest: enable samba4.drs.samba_tool_drs_showrepl py2/py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0e20bf3df7bd220fe083664e59ef87e7e8265b52
Author: Noel Power <noel.power at suse.com>
Date: Mon Sep 10 18:12:04 2018 +0100
selftest/knownfail.d: PY3 rule for replica_sync
commit c0b187982f2c02eda0860c677c98a38293dee988
Author: Noel Power <noel.power at suse.com>
Date: Tue Sep 11 13:21:18 2018 +0100
s4/torture/drs: PY3 fix error with test_samba_tool_showrepl_json
some versions of json.loads appear to need to be passed string.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 111fd4598f00e4f8bb2ac34a9c9f773a0d9fb788
Author: Noel Power <noel.power at suse.com>
Date: Fri Jun 8 10:35:13 2018 +0100
s4/torture/drs/python: make test code run in py2/py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0728cce0832c69c1e6ff2e1449ce8f9eabd4230d
Author: Noel Power <noel.power at suse.com>
Date: Mon Sep 10 13:40:15 2018 +0100
s4/torture/drs: PY3 port for test samba_tool_drs_showrepl
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 12ff5df1521452900294c1bca4bf3198682ebbcb
Author: Noel Power <noel.power at suse.com>
Date: Fri May 18 16:15:01 2018 +0100
s4/selftest: enable samba4.drs.samba_tool_drs for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1e23962adb1ca776d67a6e13b2bf22a48928d435
Author: Noel Power <noel.power at suse.com>
Date: Fri May 18 16:14:39 2018 +0100
s4/torture/drs: port samba4.drs.samba_tool_drs for py2/py3 compat
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4deb61d63f6311df9b68d54a5a11e0d544fc2fc3
Author: Noel Power <noel.power at suse.com>
Date: Fri May 18 12:43:22 2018 +0100
s4/selftest: enable samba4.ldap.password_settings for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3530dad658cd28aaeb860eb18c43a1116faec8cd
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 7 16:30:28 2018 +0100
selftest/knownfail.d: add PY3 entry for samba4.ldap.password_settings
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2f5db304df80f839afe7dbe9df7105009844801f
Author: Noel Power <noel.power at suse.com>
Date: Fri May 18 12:35:21 2018 +0100
s4/selftest: enable samba.tests.net_join for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ed1fd60781f7b1db42cb28d144b89058141c895f
Author: Noel Power <noel.power at suse.com>
Date: Thu May 17 16:06:19 2018 +0100
s4/selftest: enable samba.tests.net_join_no_spnego for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6941544a1c5ac0e8311ca9c655a445bbcf8abebe
Author: Noel Power <noel.power at suse.com>
Date: Thu May 17 15:57:38 2018 +0100
s4/selftest/tests.py enable samba.tests.getdcname for py3
commit 8db43696e70d7c4cb21172b7e7461cf6a72914a2
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 7 14:38:54 2018 +0100
python/samba: extra ndr_unpack needs bytes function
commit 7afa2d93260bdf74fec108ceca4e6add357454c0
Author: Noel Power <noel.power at suse.com>
Date: Thu May 17 14:51:40 2018 +0100
s4/selftest: enable samba.tests.samba_tool.passwordsetting for Py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 939957fc9d808dde60956cc9b1451f908bfcd6cb
Author: Noel Power <noel.power at suse.com>
Date: Thu May 31 14:30:43 2018 +0100
python/samba/netcmd: PY3 fix test samba.tests.samba_tool.passwordsettings
commit bf2c60294baf23ca8061196f8ef02e253e7a6858
Author: Noel Power <noel.power at suse.com>
Date: Tue May 15 15:33:22 2018 +0100
s4/selftest: enable samba4.drs.ridalloc_exop for python3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit fc13a1268a4a9de94efd312a8309aa55d331ae19
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 7 12:42:19 2018 +0100
python/samba: PY3 port for ridalloc_exop test to work
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit dcbdae15b2dbf71458d81aa39575cbd7aa579732
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 7 12:07:46 2018 +0100
python/samba: ndr_unpack has to take bytes not string
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit cea2fd6ce732b44651ce7ab84a6363acaf564e84
Author: Noel Power <noel.power at suse.com>
Date: Mon May 14 20:03:59 2018 +0100
s4/param: py2/p3 compat override_prefixmap should be string/bytes
commit 6b30bcf7b71538a7e933453681e13eb407896efc
Author: Noel Power <noel.power at suse.com>
Date: Thu May 17 13:34:00 2018 +0100
fallout from py_dsdb_DsReplicaAttribute to -> bytes
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5e21334d60c23178cbf13b5222c19cd38283e181
Author: Noel Power <noel.power at suse.com>
Date: Mon May 14 20:05:30 2018 +0100
s4/dsdb: py_dsdb_DsReplicaAttribute should deal with bytes in py3
Seems the underlying c code expects binary blob, so.. we should
handle str for py2 and byte for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 12949bb0ad503ba31cfaafc967aadcd75136cdaa
Author: Noel Power <noel.power at suse.com>
Date: Fri May 11 16:41:44 2018 +0100
s4/selftest: enable samba.tests.samba_tool.rodc for PY3
commit 5517d5262001899aa8e5edf09123475ad519e05b
Author: Noel Power <noel.power at suse.com>
Date: Fri May 11 16:39:06 2018 +0100
s4/selftest: enable samba.tests.upgradeprovisionneeddc for py3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 181e3966fbbeb571e9b15cb34d29ff3d95d8e7c6
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 7 10:10:56 2018 +0100
python/samba/provision: PY3 port to run samba.tests.upgradeprovisionneeddc
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 18ab3ea7bcc0ae8c66ece8094446017c7ceb736b
Author: Christof Schmitt <cs at samba.org>
Date: Fri Sep 14 17:00:26 2018 -0700
torture: Remove unnecesssary #include <fcntl.h>
This is now provided through system/filesys.h.
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/tests/util.c | 1 -
python/samba/dbchecker.py | 37 +++++-----
python/samba/join.py | 5 +-
python/samba/netcmd/pso.py | 8 +--
python/samba/provision/__init__.py | 2 +-
python/samba/remove_dc.py | 4 +-
python/samba/tests/dns_base.py | 2 +-
python/samba/tests/pso.py | 2 +-
selftest/knownfail | 4 ++
selftest/knownfail.d/getncchanges | 4 ++
selftest/knownfail.d/password_settings | 1 +
selftest/knownfail.d/replica_sync | 6 ++
source4/dsdb/pydsdb.c | 13 ++--
source4/param/provision.c | 2 +-
source4/selftest/tests.py | 79 ++++++++++++++--------
source4/torture/drs/python/delete_object.py | 10 +--
source4/torture/drs/python/drs_base.py | 13 ++--
source4/torture/drs/python/getnc_exop.py | 2 +-
source4/torture/drs/python/getncchanges.py | 2 +-
source4/torture/drs/python/link_conflicts.py | 12 ++--
source4/torture/drs/python/repl_move.py | 16 ++---
source4/torture/drs/python/repl_rodc.py | 9 +--
source4/torture/drs/python/replica_sync.py | 16 ++---
source4/torture/drs/python/samba_tool_drs.py | 54 +++++++--------
.../torture/drs/python/samba_tool_drs_showrepl.py | 33 +++++----
25 files changed, 191 insertions(+), 146 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/tests/util.c b/lib/util/tests/util.c
index d5ed34d..ad9c660 100644
--- a/lib/util/tests/util.c
+++ b/lib/util/tests/util.c
@@ -19,7 +19,6 @@
*/
#include <talloc.h>
-#include <fcntl.h>
#include "replace.h"
#include "system/filesys.h"
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 985ece30..d1251a2 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -1248,7 +1248,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
if local_usn:
if 'replPropertyMetaData' in res[0]:
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(res[0]['replPropertyMetadata']))
+ res[0]['replPropertyMetadata'][0])
found_data = False
for o in repl.ctr.array:
if o.attid == drsuapi.DRSUAPI_ATTID_isDeleted:
@@ -1414,7 +1414,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
:return: the originating time or 0 if not found
'''
- repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(val))
+ repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, val)
obj = repl.ctr
for o in repl.ctr.array:
@@ -1432,7 +1432,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
list_attid = []
in_schema_nc = dn.is_child_of(self.schema_dn)
- repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(val))
+ repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, val)
obj = repl.ctr
for o in repl.ctr.array:
@@ -1501,7 +1501,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
sd_attr = "nTSecurityDescriptor"
sd_val = obj[sd_attr]
- sd = ndr_unpack(security.descriptor, str(sd_val))
+ sd = ndr_unpack(security.descriptor, sd_val[0])
is_deleted = 'isDeleted' in obj and obj['isDeleted'][0].upper() == 'TRUE'
if is_deleted:
@@ -1674,7 +1674,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def has_replmetadata_zero_invocationid(self, dn, repl_meta_data):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(repl_meta_data))
+ repl_meta_data)
ctr = repl.ctr
found = False
for o in ctr.array:
@@ -1694,7 +1694,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def err_replmetadata_zero_invocationid(self, dn, attr, repl_meta_data):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(repl_meta_data))
+ repl_meta_data)
ctr = repl.ctr
now = samba.unix2nttime(int(time.time()))
found = False
@@ -1731,7 +1731,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def err_replmetadata_unknown_attid(self, dn, attr, repl_meta_data):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(repl_meta_data))
+ repl_meta_data)
ctr = repl.ctr
for o in ctr.array:
# Search for an invalid attid
@@ -1743,7 +1743,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def err_replmetadata_incorrect_attid(self, dn, attr, repl_meta_data, wrong_attids):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(repl_meta_data))
+ repl_meta_data)
fix = False
set_att = set()
@@ -1939,8 +1939,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
raise
else:
instancetype |= dsdb.INSTANCE_TYPE_NC_ABOVE
-
- if self.write_ncs is not None and str(nc_root) in self.write_ncs:
+ if self.write_ncs is not None and str(nc_root) in [str(x) for x in self.write_ncs]:
instancetype |= dsdb.INSTANCE_TYPE_WRITE
return instancetype
@@ -2060,25 +2059,25 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
self.report("ERROR: Not fixing num_values(%d) for '%s' on '%s'" %
(len(obj[attrname]), attrname, str(obj.dn)))
else:
- object_rdn_val = obj[attrname][0]
+ object_rdn_val = str(obj[attrname][0])
if str(attrname).lower() == 'isdeleted':
- if obj[attrname][0] != "FALSE":
+ if str(obj[attrname][0]) != "FALSE":
isDeleted = True
if str(attrname).lower() == 'systemflags':
systemFlags = int(obj[attrname][0])
if str(attrname).lower() == 'replpropertymetadata':
- if self.has_replmetadata_zero_invocationid(dn, obj[attrname]):
+ if self.has_replmetadata_zero_invocationid(dn, obj[attrname][0]):
error_count += 1
- self.err_replmetadata_zero_invocationid(dn, attrname, obj[attrname])
+ self.err_replmetadata_zero_invocationid(dn, attrname, obj[attrname][0])
# We don't continue, as we may also have other fixes for this attribute
# based on what other attributes we see.
try:
(set_attrs_from_md, list_attid_from_md, wrong_attids) \
- = self.process_metadata(dn, obj[attrname])
+ = self.process_metadata(dn, obj[attrname][0])
except KeyError:
error_count += 1
self.err_replmetadata_unknown_attid(dn, attrname, obj[attrname])
@@ -2088,7 +2087,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
or len(wrong_attids) > 0 \
or sorted(list_attid_from_md) != list_attid_from_md:
error_count += 1
- self.err_replmetadata_incorrect_attid(dn, attrname, obj[attrname], wrong_attids)
+ self.err_replmetadata_incorrect_attid(dn, attrname, obj[attrname][0], wrong_attids)
else:
# Here we check that the first attid is 0
@@ -2120,7 +2119,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
continue
current_sd = ndr_unpack(security.descriptor,
- str(obj[attrname][0]))
+ obj[attrname][0])
diff = get_diff_sds(well_known_sd, current_sd, security.dom_sid(self.samdb.get_domain_sid()))
if diff != "":
@@ -2238,7 +2237,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
if str(attrname).lower() == "instancetype":
calculated_instancetype = self.calculate_instancetype(dn)
- if len(obj["instanceType"]) != 1 or obj["instanceType"][0] != str(calculated_instancetype):
+ if len(obj["instanceType"]) != 1 or int(obj["instanceType"][0]) != calculated_instancetype:
error_count += 1
self.err_wrong_instancetype(obj, calculated_instancetype)
@@ -2281,7 +2280,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
# It's 29/12/9999 at 23:59:59 UTC as specified in MS-ADTS 7.1.1.4.2 Deleted Objects Container
expectedTimeDo = 2650466015990000000
- originating = self.get_originating_time(obj["replPropertyMetaData"], isDeletedAttId)
+ originating = self.get_originating_time(obj["replPropertyMetaData"][0], isDeletedAttId)
if originating != expectedTimeDo:
if self.confirm_all("Fix isDeleted originating_change_time on '%s'" % str(dn), 'fix_time_metadata'):
nmsg = ldb.Message()
diff --git a/python/samba/join.py b/python/samba/join.py
index f111dcc..38a1545 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -49,6 +49,8 @@ import time
import re
import os
import tempfile
+from samba.compat import text_type
+from samba.compat import get_string
class DCJoinException(Exception):
@@ -397,7 +399,7 @@ class DCJoinContext(object):
so only used for RODC join'''
res = ctx.samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=["tokenGroups"])
binsid = res[0]["tokenGroups"][0]
- return ctx.samdb.schema_format_value("objectSID", binsid)
+ return get_string(ctx.samdb.schema_format_value("objectSID", binsid))
def dn_exists(ctx, dn):
'''check if a DN exists'''
@@ -483,6 +485,7 @@ class DCJoinContext(object):
v = [rec[a]]
else:
v = rec[a]
+ v = [x.encode('utf8') if isinstance(x, text_type) else x for x in v]
rattr = ctx.tmp_samdb.dsdb_DsReplicaAttribute(ctx.tmp_samdb, a, v)
attrs.append(rattr)
diff --git a/python/samba/netcmd/pso.py b/python/samba/netcmd/pso.py
index a5c7479..200b6ff 100644
--- a/python/samba/netcmd/pso.py
+++ b/python/samba/netcmd/pso.py
@@ -559,11 +559,9 @@ class cmd_domain_pwdsettings_pso_delete(Command):
self.message("Deleted PSO %s" % psoname)
-def pso_cmp(a, b):
- """Compares two PSO LDB search results"""
+def pso_key(a):
a_precedence = int(a['msDS-PasswordSettingsPrecedence'][0])
- b_precedence = int(b['msDS-PasswordSettingsPrecedence'][0])
- return a_precedence - b_precedence
+ return a_precedence
class cmd_domain_pwdsettings_pso_list(Command):
@@ -601,7 +599,7 @@ class cmd_domain_pwdsettings_pso_list(Command):
return
# sort the PSOs so they're displayed in order of precedence
- pso_list = sorted(res, cmp=pso_cmp)
+ pso_list = sorted(res, key=pso_key)
self.outf.write("Precedence | PSO name\n")
self.outf.write("--------------------------------------------------\n")
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 66f69ce..e5f0a02 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -250,7 +250,7 @@ def find_provision_key_parameters(samdb, secretsdb, idmapdb, paths, smbconf,
# default site name
res3 = samdb.search(expression="(objectClass=site)",
- base="CN=Sites," + names.configdn, scope=ldb.SCOPE_ONELEVEL, attrs=["cn"])
+ base="CN=Sites," + str(names.configdn), scope=ldb.SCOPE_ONELEVEL, attrs=["cn"])
names.sitename = str(res3[0]["cn"])
# dns hostname and server dn
diff --git a/python/samba/remove_dc.py b/python/samba/remove_dc.py
index 03cd5fd..a606270 100644
--- a/python/samba/remove_dc.py
+++ b/python/samba/remove_dc.py
@@ -237,7 +237,7 @@ def offline_remove_server(samdb, logger,
computer_dn = None
try:
- dnsHostName = msgs[0]["dnsHostName"][0]
+ dnsHostName = str(msgs[0]["dnsHostName"][0])
except KeyError:
dnsHostName = None
@@ -268,7 +268,7 @@ def offline_remove_server(samdb, logger,
samdb.delete(computer_dn, ["tree_delete:0"])
if "dnsHostName" in msgs[0]:
- dnsHostName = msgs[0]["dnsHostName"][0]
+ dnsHostName = str(msgs[0]["dnsHostName"][0])
if remove_dns_account:
res = samdb.search(expression="(&(objectclass=user)(cn=dns-%s)(servicePrincipalName=DNS/%s))" %
diff --git a/python/samba/tests/dns_base.py b/python/samba/tests/dns_base.py
index 4769d5f..56c02dd 100644
--- a/python/samba/tests/dns_base.py
+++ b/python/samba/tests/dns_base.py
@@ -259,7 +259,7 @@ class DNSTKeyTest(DNSTest):
self.g.start_mech_by_name("spnego")
finished = False
- client_to_server = ""
+ client_to_server = b""
(finished, server_to_client) = self.g.update(client_to_server)
self.assertFalse(finished)
diff --git a/python/samba/tests/pso.py b/python/samba/tests/pso.py
index 57ec03e..af1cd7a 100644
--- a/python/samba/tests/pso.py
+++ b/python/samba/tests/pso.py
@@ -84,7 +84,7 @@ class TestUser:
res = self.ldb.search(self.dn, attrs=['msDS-ResultantPSO'])
if 'msDS-ResultantPSO' in res[0]:
- return res[0]['msDS-ResultantPSO'][0]
+ return str(res[0]['msDS-ResultantPSO'][0])
else:
return None
diff --git a/selftest/knownfail b/selftest/knownfail
index eef8134..d6feefd 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -349,6 +349,10 @@
# NTLM authentication is (intentionally) disabled in ktest
^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ktest\)
^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ad_dc_no_ntlm\)
+^samba.tests.ntlmdisabled.python\(ktest\).python3.ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ktest\)
+^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).python3.ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ad_dc_no_ntlm\)
# Disabling NTLM means you can't use samr to change the password
^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\)
^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\)
+^samba.tests.ntlmdisabled.python\(ktest\).python3.ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\)
+^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).python3.ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\)
diff --git a/selftest/knownfail.d/getncchanges b/selftest/knownfail.d/getncchanges
index 5ef1bc9..646b9dc 100644
--- a/selftest/knownfail.d/getncchanges
+++ b/selftest/knownfail.d/getncchanges
@@ -4,3 +4,7 @@ samba4.drs.getncchanges.python\(promoted_dc\).getncchanges.DrsReplicaSyncIntegri
samba4.drs.getncchanges.python\(promoted_dc\).getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt_chain\(promoted_dc\)
samba4.drs.getncchanges.python\(promoted_dc\).getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt_and_anc\(promoted_dc\)
samba4.drs.getncchanges.python\(promoted_dc\).getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt_multivalued_links\(promoted_dc\)
+samba4.drs.getncchanges.python\(promoted_dc\).python3.getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt\(promoted_dc\)
+samba4.drs.getncchanges.python\(promoted_dc\).python3.getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt_chain\(promoted_dc\)
+samba4.drs.getncchanges.python\(promoted_dc\).python3.getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt_and_anc\(promoted_dc\)
+samba4.drs.getncchanges.python\(promoted_dc\).python3.getncchanges.DrsReplicaSyncIntegrityTestCase.test_repl_get_tgt_multivalued_links\(promoted_dc\)
diff --git a/selftest/knownfail.d/password_settings b/selftest/knownfail.d/password_settings
index bbca928..7525b20 100644
--- a/selftest/knownfail.d/password_settings
+++ b/selftest/knownfail.d/password_settings
@@ -1,3 +1,4 @@
# highlights a minor corner-case discrepancy between Windows and Samba
samba4.ldap.password_settings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\)
+samba4.ldap.password_settings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\)
diff --git a/selftest/knownfail.d/replica_sync b/selftest/knownfail.d/replica_sync
index 067e07c..ffeea02 100644
--- a/selftest/knownfail.d/replica_sync
+++ b/selftest/knownfail.d/replica_sync
@@ -7,4 +7,10 @@ samba4.drs.replica_sync.python\(promoted_dc\).replica_sync.DrsReplicaSyncTestCas
samba4.drs.replica_sync.python\(vampire_dc\).replica_sync.DrsReplicaSyncTestCase.test_ReplReanimationConflict\(vampire_dc:local\)
samba4.drs.replica_sync.python\(promoted_dc\).replica_sync.DrsReplicaSyncTestCase.test_ReplReanimationConflict\(promoted_dc:local\)
+samba4.drs.replica_sync.python\(vampire_dc\).python3.replica_sync.DrsReplicaSyncTestCase.test_ReplConflictsRenamedVsNewRemoteWin\(vampire_dc:local\)
+samba4.drs.replica_sync.python\(promoted_dc\).python3.replica_sync.DrsReplicaSyncTestCase.test_ReplConflictsRenamedVsNewRemoteWin\(promoted_dc:local\)
+samba4.drs.replica_sync.python\(vampire_dc\).python3.replica_sync.DrsReplicaSyncTestCase.test_ReplConflictsRenamedVsNewLocalWin\(vampire_dc:local\)
+samba4.drs.replica_sync.python\(promoted_dc\).python3.replica_sync.DrsReplicaSyncTestCase.test_ReplConflictsRenamedVsNewLocalWin\(promoted_dc:local\)
+samba4.drs.replica_sync.python\(vampire_dc\).python3.replica_sync.DrsReplicaSyncTestCase.test_ReplReanimationConflict\(vampire_dc:local\)
+samba4.drs.replica_sync.python\(promoted_dc\).python3.replica_sync.DrsReplicaSyncTestCase.test_ReplReanimationConflict\(promoted_dc:local\)
diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index 62d2a91..19fb75d 100644
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -519,7 +519,6 @@ static PyObject *py_dsdb_DsReplicaAttribute(PyObject *self, PyObject *args)
TALLOC_CTX *tmp_ctx;
WERROR werr;
Py_ssize_t i;
- Py_ssize_t _size;
if (!PyArg_ParseTuple(args, "OsO", &py_ldb, &ldap_display_name, &el_list)) {
return NULL;
@@ -581,13 +580,17 @@ static PyObject *py_dsdb_DsReplicaAttribute(PyObject *self, PyObject *args)
for (i = 0; i < el->num_values; i++) {
PyObject *item = PyList_GetItem(el_list, i);
- if (!(PyStr_Check(item) || PyUnicode_Check(item))) {
- PyErr_Format(PyExc_TypeError, "ldif_elements should be strings");
+ if (!(PyBytes_Check(item))) {
+ PyErr_Format(PyExc_TypeError,
+ "ldif_element type should be "
+ PY_DESC_PY3_BYTES
+ );
talloc_free(tmp_ctx);
return NULL;
}
- el->values[i].data = (uint8_t *)PyStr_AsUTF8AndSize(item, &_size);
- el->values[i].length = _size;
+ el->values[i].data =
+ (uint8_t *)PyBytes_AsString(item);
+ el->values[i].length = PyBytes_Size(item);
}
}
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 4dab31f..1538506 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -377,7 +377,7 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx,
if (override_prefixmap) {
PyDict_SetItemString(parameters, "override_prefixmap",
- PyStr_FromStringAndSize((const char *)override_prefixmap->data,
+ PyBytes_FromStringAndSize((const char *)override_prefixmap->data,
override_prefixmap->length));
}
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 83efeab..be3ee68 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -643,12 +643,12 @@ planpythontestsuite("chgdcpass:local", "samba.tests.samba_tool.user_check_passwo
planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.group", py3_compatible=True)
planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.ou", py3_compatible=True)
planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.computer", py3_compatible=True)
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.forest")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.schema")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.forest", py3_compatible=True)
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.schema", py3_compatible=True)
planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.ntacl", py3_compatible=True)
planpythontestsuite("none", "samba.tests.samba_tool.provision_password_check", py3_compatible=True)
planpythontestsuite("none", "samba.tests.samba_tool.help", py3_compatible=True)
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.passwordsettings")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.passwordsettings", py3_compatible=True)
# Run these against chgdcpass to share the runtime load
planpythontestsuite("chgdcpass:local", "samba.tests.samba_tool.sites", py3_compatible=True)
@@ -730,14 +730,17 @@ if have_heimdal_support:
planoldpythontestsuite("fl2008r2dc:local",
"samba.tests.getdcname",
- extra_args=['-U"$USERNAME%$PASSWORD"'])
+ extra_args=['-U"$USERNAME%$PASSWORD"'],
+ py3_compatible=True)
planoldpythontestsuite("ad_dc",
"samba.tests.net_join_no_spnego",
- extra_args=['-U"$USERNAME%$PASSWORD"'])
+ extra_args=['-U"$USERNAME%$PASSWORD"'],
+ py3_compatible=True)
planoldpythontestsuite("ad_dc",
"samba.tests.net_join",
- extra_args=['-U"$USERNAME%$PASSWORD"'])
+ extra_args=['-U"$USERNAME%$PASSWORD"'],
+ py3_compatible=True)
# Need to test the password hashing in multiple environments to ensure that
# all the possible options are covered
#
@@ -873,7 +876,8 @@ planoldpythontestsuite("rodc:local", "replica_sync_rodc",
planoldpythontestsuite("ad_dc_ntvfs", "password_settings",
extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')],
name="samba4.ldap.password_settings.python",
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
for env in ["ad_dc_ntvfs", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
plantestsuite_loadlist("samba4.ldap_schema.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap_schema.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
@@ -907,7 +911,7 @@ for env in ["offlinebackupdc", "restoredc", "renamedc", "labdc"]:
"$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", "--realm=$REALM",
'$LOADLIST', '$LISTOPT'])
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.upgradeprovisionneeddc")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.upgradeprovisionneeddc", py3_compatible=True)
planpythontestsuite("ad_dc:local", "samba.tests.posixacl", py3_compatible=True)
planpythontestsuite("ad_dc_no_nss:local", "samba.tests.posixacl", py3_compatible=True)
plantestsuite_loadlist("samba4.deletetest.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
@@ -945,7 +949,7 @@ for env in ['rodc', 'offlinebackupdc', 'restoredc', 'renamedc', 'labdc']:
plansmbtorture4testsuite('rpc.echo', "%s:local" % env, ['ncacn_np:$SERVER', "-k", "no", '-Utestdenied%$DC_PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.rpc.echo.testdenied")
plantestsuite("samba4.blackbox.smbclient(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "utils/tests/test_smbclient.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient4])
-planpythontestsuite("rodc:local", "samba.tests.samba_tool.rodc")
+planpythontestsuite("rodc:local", "samba.tests.samba_tool.rodc", py3_compatible=True)
plantestsuite("samba.blackbox.rpcclient_samlogon", "rodc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient_samlogon.sh"),
"$DC_USERNAME", "$DC_PASSWORD", "ncacn_np:$SERVER", configuration])
@@ -969,49 +973,58 @@ planoldpythontestsuite(env, "ridalloc_exop",
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.ridalloc_exop.python(%s)" % env,
environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
for env in ['vampire_dc', 'promoted_dc']:
planoldpythontestsuite("%s:local" % env, "samba_tool_drs",
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.samba_tool_drs.python(%s)" % env,
environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
planoldpythontestsuite("%s:local" % env, "samba_tool_drs_showrepl",
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.samba_tool_drs_showrepl.python(%s)" % env,
environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
planoldpythontestsuite("%s:local" % env, "replica_sync",
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.replica_sync.python(%s)" % env,
environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
planoldpythontestsuite(env, "delete_object",
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.delete_object.python(%s)" % env,
environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
planoldpythontestsuite(env, "fsmo",
name="samba4.drs.fsmo.python(%s)" % env,
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
+ py3_compatible=True)
planoldpythontestsuite(env, "repl_move",
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.repl_move.python(%s)" % env,
environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()},
- extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+ extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
--
Samba Shared Repository
More information about the samba-cvs
mailing list