[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Mar 27 23:54:03 UTC 2018
The branch, master has been updated
via d955ab2 selftest: Run net.api.become.dc against less roles
via a93b1f6 selftest: Do not run *.lock tests against both nt4_dc and ad_dc
via f8c429b selftest: Move slow raw_protocol test to chgdcpass environment
via f4fe1c8 gitlab-ci: Split up build_samba_others and build_ctdb tasks
via 106793a selftest: Do not run krb5.kdc machine account test against ad_dc
via 5509fde selftest: Do not run raw.notify, smb2.oplock and raw.oplock twice
via 97d0203 autobuild: Run all envs that depend on ad_dc in the ad_dc job
via 606ba7a gitlab: Run fileserver tests on "private" not "shared"
via 56191dc autobuild: Split up the build further with samba-ad-dc-2
via 474b39c gitlab-ci: Set shared and private tags to allow builds that need ext4 to pass
via d920874 selftest: Move samba.tests.samba_tool{.dnscmd,.sites} to chgdcpass
via fafbeb1 selftest: Move slower base.deny1 and base.deny2 to fileserver environment
via d6ac8be autobuild: Try and test different configure options for new environments
via 0668303 Move smbtorture3 tests to fileserver environment
via a9a6fda selftest: Move base.delaywrite tests to fileserver environment
via e4a969c autobuild: Remove fileserver tests from the main build
via d47fb22 autobuild: Run all "ad_dc" environment tests in samba-ad-dc
via 3fd29c0 selftest: Do not run smb2.notify against nt4_dc and ad_dc
via fd03689 gitlab-ci: Add samba-nt4 environment to the CI
via bfee441 travis-ci: Run new samba-nt4 environment
via 7544f35 autobuild: Run nt4_dc and nt4_member tests in parallel
via 2532c0d gitlab-ci: add git variable to speed up clone
via 75d2be7 gitlab-ci: set docker image and change tag
via a8e825c gitlab-ci: Create swap space to work around the 2G image
from 77d88d7 Allow AESNI to be used on all processor supporting AESNI, not just Intel's This improves performance/reduced CPU usage. Tests performed: - Ran on Ivy Bridge and Ryzen and verified that AESNI is detected (crypto tests) - Ran on Ryzen, and observed 50% increased speed.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d955ab2239dbeab649e69520e36109ca2c49ab89
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 16:49:53 2018 +1300
selftest: Run net.api.become.dc against less roles
This test is slower than many and need not be run five times.
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): Wed Mar 28 01:53:56 CEST 2018 on sn-devel-144
commit a93b1f6fd3c534e868a883621163e434dcf81bd6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 16:45:05 2018 +1300
selftest: Do not run *.lock tests against both nt4_dc and ad_dc
This part of the protocol is not changed by being an AD DC.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit f8c429bddfd88a3083a5e576d6562026a9692aab
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 16:25:59 2018 +1300
selftest: Move slow raw_protocol test to chgdcpass environment
The ad_dc environment is busy and we need to keep it under 50mins for travis CI, so run
this on a different environment with a shorter runtime.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit f4fe1c836e492ff15611be05271e9d218ac5fc10
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 15:13:18 2018 +1300
gitlab-ci: Split up build_samba_others and build_ctdb tasks
These make too much output and the shared runners on GitLab CI object to
sending more than 4MB of output.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 106793a42c4cc3d6209190ffa2da7190a247c1be
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 12:21:52 2018 +1300
selftest: Do not run krb5.kdc machine account test against ad_dc
This code is already well tested against fl2008r2dc and just as per
8f1557a2c43e287c07723c16be78e1d858f4111d this test is slow and we can afford to be
more selective here.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 5509fdea19552ec4c08f2cebe8e72f316dacd3be
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 12:02:16 2018 +1300
selftest: Do not run raw.notify, smb2.oplock and raw.oplock twice
These are slower tests that do not need to be run against the ad_dc configuration
in particular.
This saves time in the ad_dc job which needs to stay under 50mins to
pass on travis-ci (and faster tests are better for everyone anyway).
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 97d020315148a4716395c808df2240099b66710a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 22 08:25:41 2018 +1300
autobuild: Run all envs that depend on ad_dc in the ad_dc job
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 606ba7a0ba32313de0d0ab99bdcc288a6e4c02f8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Mar 21 07:24:23 2018 +1300
gitlab: Run fileserver tests on "private" not "shared"
This might make the delaywrite tests pass
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 56191dcfb783913742a373671901def7db28e842
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Mar 21 07:02:42 2018 +1300
autobuild: Split up the build further with samba-ad-dc-2
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 474b39ce56c006b922118fae176d9e5a5f62ad49
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 20 15:07:03 2018 +1300
gitlab-ci: Set shared and private tags to allow builds that need ext4 to pass
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit d92087487d9e4c86f807631fc18a6d136f4841b4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 17:08:51 2018 +1300
selftest: Move samba.tests.samba_tool{.dnscmd,.sites} to chgdcpass
This helps reduce the runtime of ad_dc which needs to be under 50mins
including build time to run on travis-ci.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit fafbeb18900b66df66e9b89276b66e2b66f49965
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 08:04:22 2018 +1300
selftest: Move slower base.deny1 and base.deny2 to fileserver environment
This avoids these running in the ad_dc environment which we need to get under 50mins for
travis-ci.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit d6ac8beacf0762e786e57c07fd56fb4267a88b6b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 4 21:36:22 2018 +1300
autobuild: Try and test different configure options for new environments
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 0668303a3a6947dc57595bed1a78df3c0a628f68
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 4 21:33:50 2018 +1300
Move smbtorture3 tests to fileserver environment
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit a9a6fdadbb2864678deb4c6cb85c7991d07576ab
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 4 21:20:31 2018 +1300
selftest: Move base.delaywrite tests to fileserver environment
This aims to keep the ad_dc tests well below 50mins for travis CI and
base.delaywrite is very slow.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit e4a969ccc55758b402483e7e1b31ab054624c6c5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 4 21:32:09 2018 +1300
autobuild: Remove fileserver tests from the main build
Again, this is to allow these to run in the 50min timelimit
of travis-ci and so gain test coverage.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit d47fb2232bdbbc401d59b86d2641078c6e7bfdc6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 30 11:13:55 2017 +1200
autobuild: Run all "ad_dc" environment tests in samba-ad-dc
This allows us not to run ad_dc tests in the main build, making the
autobuild process faster. The ad_dc tests run in less than 50mins
on travis-ci, which allows this part of the tests to be run.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 3fd29c05f347dfa305d93be9202fbae56570d223
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Mar 3 21:03:11 2018 +1300
selftest: Do not run smb2.notify against nt4_dc and ad_dc
This is a slow test and we need to keep the time on ad_dc down to below 50mins total
for travis-ci.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit fd0368999e80839d7b90379a53732431504ea646
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Dec 5 11:34:08 2017 +1300
gitlab-ci: Add samba-nt4 environment to the CI
This parallel build is de-coupled from the main samba build
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit bfee4414298b9bba0c1a1b6f1416f179ad1b3863
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 30 11:44:58 2017 +1200
travis-ci: Run new samba-nt4 environment
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 7544f3574168d4a41857550628e4391392e39f5b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 30 11:15:40 2017 +1200
autobuild: Run nt4_dc and nt4_member tests in parallel
These do not interact with the main AD DC environments, so can run in parallel
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 2532c0db0ce2c189ab6fc96ab5c5e56ce5b17ecd
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Tue Dec 12 14:26:07 2017 +1300
gitlab-ci: add git variable to speed up clone
Set GIT_STATEGY to fetch, and GIT_DEPTH to 3.
This will speed up cloning for repos.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 75d2be7da584a017beab493355cb88ce7dc61f4a
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Tue Nov 28 10:20:54 2017 +1300
gitlab-ci: set docker image and change tag
1. Specify docker image to use in gitlab-ci.yml
2. Change tag autobuild to docker
So we can use gitlab.com shared runners.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit a8e825c41c4b829a174451bd02162c763a2e887e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 20 14:15:47 2018 +1300
gitlab-ci: Create swap space to work around the 2G image
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 108 +++++++++++++++++++++++++++++++++++++++++++---
.travis.yml | 4 ++
script/autobuild.py | 59 ++++++++++++++++++++++++-
source3/selftest/tests.py | 13 +++---
source4/selftest/tests.py | 11 +++--
5 files changed, 176 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60accd4..cde8341 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,142 @@
# see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
+image: registry.gitlab.com/samba-team/samba:latest
+
+variables:
+ GIT_STRATEGY: fetch
+ GIT_DEPTH: "3"
+
before_script:
- - echo "Build starting ..."
+ - echo "Build starting (preparing swap)..."
+ - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
+ sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
+ sudo mkswap /samba-swap;
+ sudo swapon /samba-swap;
+ fi
build_samba:
stage: build
tags:
- - autobuild
+ - docker
+ - private
script:
# this one takes about 4 hours to finish
- python script/autobuild.py samba --verbose --tail --testbase /tmp/samba-testbase
+build_samba_nt4:
+ stage: build
+ tags:
+ - docker
+ - private
+ script:
+ # this one takes about 1 hours to finish
+ - python script/autobuild.py samba-nt4 --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_fileserver:
+ stage: build
+ tags:
+ - docker
+ - private
+ script:
+ # this one takes about 1 hours to finish
+ - python script/autobuild.py samba-fileserver --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_ad_dc:
+ stage: build
+ tags:
+ - docker
+ - private
+ script:
+ # this one takes about 1 hours to finish
+ - python script/autobuild.py samba-ad-dc --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_ad_dc_2:
+ stage: build
+ tags:
+ - docker
+ - private
+ script:
+ # this one takes about 1 hours to finish
+ - python script/autobuild.py samba-ad-dc-2 --verbose --tail --testbase /tmp/samba-testbase
+
build_samba_none_env:
stage: build
tags:
- - autobuild
+ - docker
+ - shared
script:
# this one takes about 1 hours to finish
- python script/autobuild.py samba-none-env --verbose --tail --testbase /tmp/samba-testbase
-build_samba_others:
+build_samba_nopython:
stage: build
tags:
- - autobuild
+ - docker
+ - shared
script:
- python script/autobuild.py samba-nopython --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_systemkrb5:
+ stage: build
+ tags:
+ - docker
+ - shared
+ script:
- python script/autobuild.py samba-systemkrb5 --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_xc:
+ stage: build
+ tags:
+ - docker
+ - shared
+ script:
- python script/autobuild.py samba-xc --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_o3:
+ stage: build
+ tags:
+ - docker
+ - shared
+ script:
- python script/autobuild.py samba-o3 --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_libs:
+ stage: build
+ tags:
+ - docker
+ - shared
+ script:
- python script/autobuild.py samba-libs --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_static:
+ stage: build
+ tags:
+ - docker
+ - shared
+ script:
- python script/autobuild.py samba-static --verbose --tail --testbase /tmp/samba-testbase
build_ctdb:
stage: build
tags:
- - autobuild
+ - docker
+ - shared
script:
- python script/autobuild.py samba-ctdb --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_ctdb:
+ stage: build
+ tags:
+ - docker
+ - shared
+ script:
- python script/autobuild.py ctdb --verbose --tail --testbase /tmp/samba-testbase
build_others:
stage: build
tags:
- - autobuild
+ - docker
+ - shared
script:
- python script/autobuild.py ldb --verbose --tail --testbase /tmp/samba-testbase
- python script/autobuild.py pidl --verbose --tail --testbase /tmp/samba-testbase
diff --git a/.travis.yml b/.travis.yml
index 19d5b4c..e9b6a6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,10 @@ env:
- TASK=samba-none-env
- TASK=samba-nopython
- TASK=samba-systemkrb5
+ - TASK=samba-nt4
+ - TASK=samba-fileserver
+ - TASK=samba-ad-dc
+ - TASK=samba-ad-dc-2
- TASK=ldb
- TASK=tdb
- TASK=talloc
diff --git a/script/autobuild.py b/script/autobuild.py
index 699fb41..e00eebd 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -26,6 +26,8 @@ cleanup_list = []
builddirs = {
"ctdb" : "ctdb",
"samba" : ".",
+ "samba-nt4" : ".",
+ "samba-fileserver" : ".",
"samba-xc" : ".",
"samba-o3" : ".",
"samba-ctdb" : ".",
@@ -33,6 +35,8 @@ builddirs = {
"samba-static" : ".",
"samba-test-only" : ".",
"samba-none-env" : ".",
+ "samba-ad-dc" : ".",
+ "samba-ad-dc-2" : ".",
"samba-systemkrb5" : ".",
"samba-nopython" : ".",
"ldb" : "lib/ldb",
@@ -48,12 +52,16 @@ builddirs = {
defaulttasks = [ "ctdb",
"samba",
+ "samba-nt4",
+ "samba-fileserver",
"samba-xc",
"samba-o3",
"samba-ctdb",
"samba-libs",
"samba-static",
"samba-none-env",
+ "samba-ad-dc",
+ "samba-ad-dc-2",
"samba-systemkrb5",
"samba-nopython",
"ldb",
@@ -90,16 +98,63 @@ tasks = {
("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain") ],
- # We have 'test' before 'install' because, 'test' should work without 'install'
+ # We have 'test' before 'install' because, 'test' should work without 'install (runs ad_dc_ntvfs and all the other envs)'
"samba" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--exclude-env=none'",
+ "TESTS='--exclude-env=none "
+ "--exclude-env=nt4_dc "
+ "--exclude-env=nt4_member "
+ "--exclude-env=ad_dc "
+ "--exclude-env=fl2003dc "
+ "--exclude-env=fl2008r2dc "
+ "--exclude-env=ad_member "
+ "--exclude-env=ad_member_idmap_rid "
+ "--exclude-env=ad_member_idmap_ad "
+ "--exclude-env=chgdcpass "
+ "--exclude-env=vampire_2000_dc "
+ "--exclude-env=fl2000dc "
+ "--exclude-env=fileserver'",
"text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain") ],
+ # We split out this so the isolated nt4_dc tests do not wait for ad_dc or ad_dc_ntvfs tests (which are long)
+ "samba-nt4" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=nt4_dc --include-env=nt4_member'", "text/plain"),
+ ("install", "make install", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+ ("clean", "make clean", "text/plain") ],
+
+ # We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
+ "samba-fileserver" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+ ("configure", "./configure.developer --without-ad-dc --without-ads --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=fileserver'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ # We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
+ "samba-ad-dc" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 TESTS='"
+ "--include-env=ad_dc "
+ "--include-env=fl2003dc "
+ "--include-env=fl2008r2dc "
+ "--include-env=ad_member "
+ "--include-env=ad_member_idmap_rid "
+ "--include-env=ad_member_idmap_ad'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ # We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
+ "samba-ad-dc-2" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=chgdcpass --include-env=vampire_2000_dc --include-env=fl2000dc'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
"samba-test-only" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"',"text/plain") ],
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index c93abf5..a9b7c20 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -85,7 +85,7 @@ tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7"
"BAD-NBT-SESSION"]
for t in tests:
- plantestsuite("samba3.smbtorture_s3.plain(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.plain(fileserver).%s" % t, "fileserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
plantestsuite("samba3.smbtorture_s3.crypt_client(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
if t == "TORTURE":
# this is a negative test to verify that the server rejects
@@ -404,8 +404,8 @@ vfs = ["vfs.fruit", "vfs.acl_xattr", "vfs.fruit_netatalk", "vfs.fruit_file_id",
tests= base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap + vfs
for t in tests:
- if t == "base.delaywrite":
- plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
+ if t == "base.delaywrite" or t == "base.deny1" or t == "base.deny2":
+ plansmbtorture4testsuite(t, "fileserver", '//$SERVER/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
elif t == "base.createx_access":
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
elif t == "rap.sam":
@@ -488,7 +488,8 @@ for t in tests:
elif t == "smb2.lock":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
- plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
+ elif t == "raw.lock" or t == "base.lock":
+ plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
elif t == "raw.read":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')
@@ -517,9 +518,9 @@ for t in tests:
plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$USERNAME%$PASSWORD')
elif t == "smb2.change_notify_disabled":
plansmbtorture4testsuite(t, "simpleserver", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
- elif t == "smb2.notify":
+ elif t == "smb2.notify" or t == "raw.notify" or t == "smb2.oplock" or t == "raw.oplock":
+ # These tests are a little slower so don't duplicate them with ad_dc
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --signing=required')
- plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD --signing=required')
elif t == "smb2.dosmode":
plansmbtorture4testsuite(t, "simpleserver", '//$SERVER/dosmode -U$USERNAME%$PASSWORD')
elif t == "smb2.kernel-oplocks":
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 700decd..660a75f 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -263,6 +263,8 @@ for env in ["ad_dc_ntvfs", "fl2000dc", "fl2003dc", "fl2008r2dc", "ad_dc"]:
for bindoptions in ["connect", "krb5", "krb5,sign", "krb5,seal", "spnego", "spnego,sign", "spnego,seal"] + validate_list + ["padcheck", "bigendian", "bigendian,seal"]:
echooptions = "--option=socket:testnonblock=True --option=torture:quick=yes -k yes"
plansmbtorture4testsuite('rpc.echo', env, ["%s:$SERVER[%s]" % (transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, echooptions))
+
+for env in ["fl2000dc", "fl2008r2dc"]:
plansmbtorture4testsuite("net.api.become.dc", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W$DOMAIN' % validate)
for bindoptions in ["sign", "seal"]:
@@ -612,8 +614,9 @@ planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.ntacl")
planpythontestsuite("none", "samba.tests.samba_tool.provision_password_check")
planpythontestsuite("none", "samba.tests.samba_tool.help")
-planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.sites")
-planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.dnscmd")
+# Run these against chgdcpass to share the runtime load
+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")
@@ -624,7 +627,7 @@ planoldpythontestsuite("ad_dc:local", "samba.tests.dckeytab", extra_args=['-U"$U
planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
-planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.raw_protocol", extra_args=['-U"$USERNAME%$PASSWORD"'])
+planoldpythontestsuite("chgdcpass", "samba.tests.dcerpc.raw_protocol", extra_args=['-U"$USERNAME%$PASSWORD"'])
if have_heimdal_support:
planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log", extra_args=['-U"$USERNAME%$PASSWORD"'],
environ={'CLIENT_IP': '127.0.0.11',
@@ -977,7 +980,7 @@ plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '
"samba4.krb5.kdc with specified account")
-for env in ["rodc", "promoted_dc", "ad_dc", "fl2000dc", "fl2008r2dc"]:
+for env in ["rodc", "promoted_dc", "fl2000dc", "fl2008r2dc"]:
if env == "rodc":
# The machine account is cached at the RODC, as it is the local account
extra_options = ['--option=torture:expect_rodc=true', '--option=torture:expect_cached_at_rodc=true']
--
Samba Shared Repository
More information about the samba-cvs
mailing list