[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sat Aug 25 09:54:01 UTC 2018
The branch, master has been updated
via 05389bc autobuild: Allow automatic handling of autobuild tasks ending in -py3
via 3d2baa9 selftest: Move samba.tests.lsa_string to none environment, it does not contact a server
via da6530d selftest: Move samba.tests.dcerpc.rpcecho to chgdcpass:local
via 9a19563 selftest: Ensure all python3 tests are tagged (named) python3
via a4f9e38 selftest: Ensure winbindd is talking to the DC (itself) at startup
from e5e6619 smbd: Remove unused KOPLOCK flags
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 05389bcbf854eaad1e299d5bea7d68806f7b72ba
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Aug 16 13:48:21 2018 +1200
autobuild: Allow automatic handling of autobuild tasks ending in -py3
This will allow splitting up of the python2 and python3 tests without
duplication of this already complex file.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sat Aug 25 11:53:15 CEST 2018 on sn-devel-144
commit 3d2baa9c95c8e2b3f8952e5e0bf6984408961b13
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Aug 17 09:31:48 2018 +1200
selftest: Move samba.tests.lsa_string to none environment, it does not contact a server
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit da6530d9d18e5923ebd94c8a3f2865a193b37a73
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Aug 17 09:31:10 2018 +1200
selftest: Move samba.tests.dcerpc.rpcecho to chgdcpass:local
Before this patch, no python3-compatible tests ran against any of fl2000dc, vampire_2000_dc or chgdcpass
and so an autobuild of the samba-ad-dc-2-py3 environment would fail with no tests to run.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 9a19563eaacd660f09a49a775bdbc5ba1b25925c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Aug 17 17:27:06 2018 +1200
selftest: Ensure all python3 tests are tagged (named) python3
This will help when splitting them into a distinct build.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit a4f9e3805e2e22d5f100a3ac4d9b7ecfaa3b5f4e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Aug 20 10:14:16 2018 +1200
selftest: Ensure winbindd is talking to the DC (itself) at startup
This might reduce issues with the first winbind-using test failing
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
script/autobuild.py | 11 +++++++++--
selftest/target/Samba4.pm | 2 +-
source4/selftest/tests.py | 8 +++++---
3 files changed, 15 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/autobuild.py b/script/autobuild.py
index 8ffa6d4..5fac8d3 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -404,8 +404,9 @@ def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
class builder(object):
'''handle build of one directory'''
- def __init__(self, name, sequence, cp=True):
+ def __init__(self, name, sequence, cp=True, py3=False):
self.name = name
+ self.py3 = py3
self.dir = builddirs[name]
self.tag = self.name.replace('/', '_')
@@ -474,7 +475,13 @@ class buildlist(object):
os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
for n in tasknames:
- b = builder(n, tasks[n], cp=n is not "pidl")
+ if n not in tasknames and n.endswith("-py3"):
+ b = builder(n,
+ tasks[n[:-4]],
+ cp=n is not "pidl",
+ py3=True)
+ else:
+ b = builder(n, tasks[n], cp=n is not "pidl")
self.tlist.append(b)
if options.retry:
rebase_remote = "rebaseon"
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 4584b5f..00dfd28 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -259,7 +259,7 @@ sub wait_for_start($$)
my $cmd = "NSS_WRAPPER_PASSWD=$testenv_vars->{NSS_WRAPPER_PASSWD} ";
$cmd .= "NSS_WRAPPER_GROUP=$testenv_vars->{NSS_WRAPPER_GROUP} ";
$cmd .= "SELFTEST_WINBINDD_SOCKET_DIR=$testenv_vars->{SELFTEST_WINBINDD_SOCKET_DIR} ";
- $cmd .= "$wbinfo -p";
+ $cmd .= "$wbinfo -P";
$ret = system($cmd);
if ($ret != 0) {
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 0b41866..f884d27 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -587,7 +587,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
plantestsuite_loadlist(name, env, args)
if py3_compatible and extra_python is not None:
args[args.index(subunitrun)] = subunitrun3
- plantestsuite_loadlist(name, env, args)
+ plantestsuite_loadlist(name + ".python3", env, args)
planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
@@ -638,7 +638,9 @@ planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.passwordsetting
planpythontestsuite("chgdcpass:local", "samba.tests.samba_tool.sites")
planpythontestsuite("chgdcpass:local", "samba.tests.samba_tool.dnscmd")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.rpcecho", py3_compatible=True)
+# Run this against chgdcpass to ensure at least one python3 test
+# against this autobuild target (samba-ad-dc-2)
+planpythontestsuite("chgdcpass:local", "samba.tests.dcerpc.rpcecho", py3_compatible=True)
planoldpythontestsuite("nt4_dc", "samba.tests.netbios", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
planoldpythontestsuite("ad_dc:local", "samba.tests.gpo", extra_args=['-U"$USERNAME%$PASSWORD"'])
@@ -760,7 +762,7 @@ planoldpythontestsuite("fl2000dc:local",
"samba.tests.encrypted_secrets",
extra_args=['-U"$USERNAME%$PASSWORD"'])
-planpythontestsuite("ad_dc_ntvfs:local",
+planpythontestsuite("none",
"samba.tests.lsa_string",
py3_compatible=True)
--
Samba Shared Repository
More information about the samba-cvs
mailing list