From 422b2fa0d064f2afeeec400223bb8a47deecc4a5 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 24 Apr 2011 10:36:56 +0200 Subject: s3: Run pthreadpooltest in make test Autobuild-User: Volker Lendecke Autobuild-Date: Mon Apr 25 10:39:12 CEST 2011 on sn-devel-104 --- source3/selftest/tests.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/selftest') diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index f05e00537d..2e5eee1394 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -140,6 +140,9 @@ plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local", [os. plantestsuite("samba3.blackbox.testparm", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_testparm_s3.sh"), "$LOCAL_PATH"]) +plantestsuite( + "samba3.pthreadpool", "s3dc", + [os.path.join(samba3srcdir, "script/tests/test_pthreadpool.sh")]) #smbtorture4 tests -- cgit From 34e3501a32f731b527bbba88eb44d6433b826aa2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 28 Apr 2011 13:58:07 +1000 Subject: selftest: Fix combination of Samba3 and Samba4 test lists The previous code was too subtle, and tried to filter via two xfail scripts. The --fail-immediately for the source3 knownfail would then fail samba4 know failures. Andrew Bartlett Pair-Programmed-With: Andrew Tridgell --- source3/selftest/quick | 1 + 1 file changed, 1 insertion(+) create mode 100644 source3/selftest/quick (limited to 'source3/selftest') diff --git a/source3/selftest/quick b/source3/selftest/quick new file mode 100644 index 0000000000..bb3b066b49 --- /dev/null +++ b/source3/selftest/quick @@ -0,0 +1 @@ +#none -- cgit From 320789b89024c8dbbb59a628f06622748c329eb4 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 16 May 2011 12:48:10 +0200 Subject: s3-selftest: no point in running base.chkpath and base.delaywrite twice. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Bjoern Baumbach for pointing this out! Guenther Signed-off-by: Günther Deschner --- source3/selftest/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/selftest') diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 2e5eee1394..08e62ebbec 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -198,17 +198,17 @@ if sub.returncode == 0: for t in tests: if t == "base.delaywrite": plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900') - if t == "rap.sam": + elif t == "rap.sam": plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1') elif t == "unix.whoami": plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD') elif t == "raw.samba3posixtimedlock": plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/s3dc/share') + elif t == "raw.chkpath": + plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') else: plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') - if t == "raw.chkpath": - plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') test = 'rpc.lsa.lookupsids' auth_options = ["", "ntlm", "spnego" ] -- cgit From ce9d63d1618e1cd803e68a0d97ec352a8d125070 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 22 May 2011 14:16:46 +0200 Subject: s3: Remove the smbtorture3 OPLOCK3 test This is the last user of cli_receive_smb. Oplocks are nowadays tested in smbtorture4, this mainly has historic value --- source3/selftest/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/selftest') diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 08e62ebbec..962ea7f99f 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -53,7 +53,7 @@ plantestsuite("samba3.local_s3", "s3dc:local", [os.path.join(samba3srcdir, "scri tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "LOCK9", "UNLINK", "BROWSE", "ATTR", "TRANS2", "TORTURE", - "OPLOCK1", "OPLOCK2", "OPLOCK3", "OPLOCK4", "STREAMERROR", + "OPLOCK1", "OPLOCK2", "OPLOCK4", "STREAMERROR", "DIR", "DIR1", "DIR-CREATETIME", "TCON", "TCONDEV", "RW1", "RW2", "RW3", "RW-SIGNING", "OPEN", "XCOPY", "RENAME", "DELETE", "DELETE-LN", "PROPERTIES", "W2K", "TCON2", "IOCTL", "CHKPATH", "FDSESS", "LOCAL-SUBSTITUTE", "CHAIN1", -- cgit From e7cf95c5417e07fb3544b8731cb6a33fbcf40eff Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 23 May 2011 09:22:07 +1000 Subject: selftest: Make knowfail/skip files consistent, always use ^prefix Except in one case (where we mark printing tests as knownfail), this has all our regular expressions start with ^, which ensures we don't accidentially mix up the samba3/samba4 prefix here. Because of the particular values in these files at the moment, this should not change the set of tests, but it will help to ensure that future edits follow the correct pattern. Andrew Bartlett --- source3/selftest/knownfail | 22 +++++++++++----------- source3/selftest/skip | 46 +++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 34 deletions(-) (limited to 'source3/selftest') diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail index 95f01f64dc..b62ef3e667 100644 --- a/source3/selftest/knownfail +++ b/source3/selftest/knownfail @@ -1,14 +1,14 @@ -samba3.blackbox.failure # this is designed to fail, for testing our test infrastructure +^samba3.blackbox.failure # this is designed to fail, for testing our test infrastructure .*printer.*print_test_extended # fails on some hosts due to timing issues ? .*printer.*print_test # fails on some hosts due to timing issues ? -samba3.posix_s3.rap.printing # fails sometimes on sn-devel -samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ? -samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure -samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure +^samba3.posix_s3.rap.printing # fails sometimes on sn-devel +^samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ? +^samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure +^samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure .*driver.add_driver_timestamps # we only can store dates, not timestamps -samba3.raw.mux.* #This test is flaky on the async lock time -samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel -samba3.posix_s3.nbt.dgram.*netlogon2 -samba3.*rap.sam.*.useradd # Not provided by Samba 3 -samba3.*rap.sam.*.userdelete # Not provided by Samba 3 -samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3 +^samba3.raw.mux.* #This test is flaky on the async lock time +^samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel +^samba3.posix_s3.nbt.dgram.*netlogon2 +^samba3.*rap.sam.*.useradd # Not provided by Samba 3 +^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 +^samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3 diff --git a/source3/selftest/skip b/source3/selftest/skip index 02166a1457..4366ae6872 100644 --- a/source3/selftest/skip +++ b/source3/selftest/skip @@ -1,23 +1,23 @@ -samba3.smbtorture_s3.*.randomipc -samba3.smbtorture_s3.*.negnowait -samba3.smbtorture_s3.*.nbench -samba3.smbtorture_s3.*.errmapextract -samba3.smbtorture_s3.*.trans2scan -samba3.smbtorture_s3.*.nttransscan -samba3.smbtorture_s3.*.deny1 -samba3.smbtorture_s3.*.deny2 -samba3.smbtorture_s3.*.openattr -samba3.smbtorture_s3.*.casetable -samba3.smbtorture_s3.*.eatest -samba3.smbtorture_s3.*.mangle -samba3.smbtorture_s3.*.utable -samba3.smbtorture_s3.*.pipe_number -samba3.smbtorture_s3.*.CHAIN1 -samba3.*base.charset -samba3.*raw.acls -samba3.*raw.composite -samba3.*raw.context -samba3.*raw.ioctl -samba3.*raw.qfileinfo -samba3.*raw.qfsinfo -samba3.*raw.sfileinfo.base +^samba3.smbtorture_s3.*.randomipc +^samba3.smbtorture_s3.*.negnowait +^samba3.smbtorture_s3.*.nbench +^samba3.smbtorture_s3.*.errmapextract +^samba3.smbtorture_s3.*.trans2scan +^samba3.smbtorture_s3.*.nttransscan +^samba3.smbtorture_s3.*.deny1 +^samba3.smbtorture_s3.*.deny2 +^samba3.smbtorture_s3.*.openattr +^samba3.smbtorture_s3.*.casetable +^samba3.smbtorture_s3.*.eatest +^samba3.smbtorture_s3.*.mangle +^samba3.smbtorture_s3.*.utable +^samba3.smbtorture_s3.*.pipe_number +^samba3.smbtorture_s3.*.CHAIN1 +^samba3.*base.charset +^samba3.*raw.acls +^samba3.*raw.composite +^samba3.*raw.context +^samba3.*raw.ioctl +^samba3.*raw.qfileinfo +^samba3.*raw.qfsinfo +^samba3.*raw.sfileinfo.base -- cgit From 040d917c105b36f932ba4c9c9585234db30af7aa Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 29 May 2011 19:14:48 +0200 Subject: s3: Run BAD-NBT-SESSION in make test --- source3/selftest/tests.py | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/selftest') diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 962ea7f99f..fda3be1377 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -60,6 +60,7 @@ tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "GETADDRINFO", "POSIX", "UID-REGRESSION-TEST", "SHORTNAME-TEST", "LOCAL-BASE64", "LOCAL-GENCACHE", "POSIX-APPEND", "CASE-INSENSITIVE-CREATE", + "BAD-NBT-SESSION", "LOCAL-string_to_sid", "LOCAL-CONVERT-STRING" ] for t in tests: -- cgit From 0931147cbca6cd2f438b2fa49d222606246e364d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Mar 2011 08:23:27 +0200 Subject: s3:selftest: add a few more raw.* tests metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Wed Jun 8 18:57:01 CEST 2011 on sn-devel-104 --- source3/selftest/tests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/selftest') diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index fda3be1377..361f4aa857 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -161,7 +161,9 @@ raw = ["raw.acls", "raw.chkpath", "raw.close", "raw.composite", "raw.context", " "raw.sfileinfo.base", "raw.sfileinfo.bug", "raw.streams", "raw.unlink", "raw.write", "raw.samba3hide", "raw.samba3badpath", "raw.sfileinfo.rename", "raw.samba3caseinsensitive", "raw.samba3posixtimedlock", - "raw.samba3rootdirfid", "raw.sfileinfo.end-of-file"] + "raw.samba3rootdirfid", "raw.sfileinfo.end-of-file", + "raw.bench-oplock", "raw.bench-lock", "raw.bench-open", "raw.bench-tcon", + "raw.samba3checkfsp", "raw.samba3closeerr", "raw.samba3oplocklogoff"] smb2 = ["smb2.lock", "smb2.read", "smb2.compound", "smb2.connect", "smb2.scan", "smb2.scanfind", "smb2.bench-oplock"] -- cgit From 5a37d3217a257b28d94b04d2637585e71e80d33c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 9 Jun 2011 16:20:15 +1000 Subject: s3-selftest Add test for smbclient --authentication-file Autobuild-User: Andrew Bartlett Autobuild-Date: Thu Jun 9 13:49:59 CEST 2011 on sn-devel-104 --- source3/selftest/tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/selftest') diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 361f4aa857..262c564612 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -113,20 +113,20 @@ for env in ["secshare", "secserver"]: # plain for env in ["s3dc"]: - plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration]) + plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration]) for env in ["member"]: - plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration]) + plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration]) for env in ["s3dc"]: - plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration, "--signing=required"]) + plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration, "--signing=required"]) for env in ["member"]: - plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration, "--signing=required"]) + plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration, "--signing=required"]) # encrypted for env in ["s3dc"]: - plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration, "-e"]) + plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), configuration, "-e"]) #TODO encrypted against member, with member creds, and with DC creds plantestsuite("samba3.blackbox.net.misc", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"), -- cgit From 5eecc854236f0b943aaa89e0c3a46f9fbd208ca9 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 18:40:33 +0930 Subject: tdb2: create tdb2 versions of various testing TDBs. Soon, TDB2 will handle tdb1 files, but until then, we substitute. Signed-off-by: Rusty Russell --- source3/selftest/ktest-secrets.tdb2 | Bin 0 -> 14592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 source3/selftest/ktest-secrets.tdb2 (limited to 'source3/selftest') diff --git a/source3/selftest/ktest-secrets.tdb2 b/source3/selftest/ktest-secrets.tdb2 new file mode 100644 index 0000000000..2af58b140f Binary files /dev/null and b/source3/selftest/ktest-secrets.tdb2 differ -- cgit From 79b1a1092dbbb45bb8839c71e48479d1c6037b48 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 10 May 2011 22:14:34 +0200 Subject: selftest: Run tests for libsmbclient and libnetapi This adds the known failure for the one test (netbios browsing) that fails. Andrew Bartlett --- source3/selftest/knownfail | 2 ++ source3/selftest/tests.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/selftest') diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail index b62ef3e667..4f746c8d70 100644 --- a/source3/selftest/knownfail +++ b/source3/selftest/knownfail @@ -12,3 +12,5 @@ ^samba3.*rap.sam.*.useradd # Not provided by Samba 3 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 ^samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3 +^samba3.posix_s3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered + diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 262c564612..2a3002189c 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -192,7 +192,9 @@ unix = ["unix.info2", "unix.whoami"] nbt = ["nbt.dgram" ] -tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt +libsmbclient = ["libsmbclient"] + +tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt + libsmbclient sub = subprocess.Popen("%s --version 2> /dev/null" % smb4torture, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True) sub.communicate("") -- cgit