[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri Dec 10 20:17:02 MST 2010
The branch, master has been updated
via 35fbc7b s4-smbtorture: Make test names lowercase and dot-separated.
via 68d97f8 talloc: Add ability to generate Python docs using pydoctor.
from 7ef1de3 smbtorture: correct error handling in BASE-OPEN.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 35fbc7bbda5851f7172538f79fc79be201f1d521
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 11 03:26:31 2010 +0100
s4-smbtorture: Make test names lowercase and dot-separated.
This is consistent with the test names used by selftest, should
make the names less confusing and easier to integrate with other tools.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104
commit 68d97f8b492d1d075ed77a4bab7f178d10570106
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 11 01:05:13 2010 +0100
talloc: Add ability to generate Python docs using pydoctor.
-----------------------------------------------------------------------
Summary of changes:
lib/compression/testsuite.c | 2 +-
lib/nss_wrapper/testsuite.c | 2 +-
lib/socket_wrapper/testsuite.c | 2 +-
lib/talloc/Makefile | 3 +
lib/talloc/wscript | 7 ++
lib/tdr/testsuite.c | 2 +-
lib/tevent/testsuite.c | 2 +-
lib/util/charset/tests/charset.c | 2 +-
lib/util/charset/tests/iconv.c | 2 +-
lib/util/tests/asn1_tests.c | 2 +-
lib/util/tests/data_blob.c | 2 +-
lib/util/tests/dlinklist.c | 2 +-
lib/util/tests/file.c | 5 +-
lib/util/tests/genrand.c | 2 +-
lib/util/tests/idtree.c | 2 +-
lib/util/tests/parmlist.c | 2 +-
lib/util/tests/str.c | 2 +-
lib/util/tests/strlist.c | 2 +-
lib/util/tests/time.c | 2 +-
nsswitch/libwbclient/tests/wbclient.c | 2 +-
source3/script/tests/test_posix_s3.sh | 98 ++++++++++----------
source3/selftest/tests.sh | 9 +--
source4/auth/credentials/tests/simple.c | 3 +-
source4/dsdb/common/tests/dsdb_dn.c | 8 +-
source4/dsdb/schema/tests/schema_syntax.c | 2 +-
source4/lib/messaging/tests/irpc.c | 2 +-
source4/lib/messaging/tests/messaging.c | 2 +-
source4/lib/registry/tests/diff.c | 2 +-
source4/lib/registry/tests/generic.c | 2 +-
source4/lib/registry/tests/hive.c | 2 +-
source4/lib/registry/tests/registry.c | 2 +-
source4/lib/socket/testsuite.c | 3 +-
source4/libcli/resolve/testsuite.c | 2 +-
source4/libcli/security/tests/sddl.c | 2 +-
source4/librpc/tests/binding_string.c | 2 +-
source4/param/tests/loadparm.c | 2 +-
source4/param/tests/share.c | 2 +-
source4/selftest/knownfail | 42 +++++-----
source4/selftest/tests.py | 127 +++++++++++++--------------
source4/torture/auth/ntlmssp.c | 3 +-
source4/torture/auth/pac.c | 2 +-
source4/torture/basic/aliases.c | 2 +-
source4/torture/basic/base.c | 98 ++++++++++----------
source4/torture/basic/charset.c | 2 +-
source4/torture/basic/delaywrite.c | 2 +-
source4/torture/basic/delete.c | 3 +-
source4/torture/basic/locking.c | 2 +-
source4/torture/dfs/domaindfs.c | 4 +-
source4/torture/drs/drs_init.c | 4 +-
source4/torture/drs/rpc/dssync.c | 2 +-
source4/torture/drs/unit/prefixmap_tests.c | 2 +-
source4/torture/drs/unit/schemainfo_tests.c | 2 +-
source4/torture/ldap/common.c | 16 ++--
source4/torture/ldb/ldb.c | 12 ++--
source4/torture/libnet/libnet.c | 67 +++++++-------
source4/torture/libnetapi/libnetapi.c | 10 +-
source4/torture/libsmbclient/libsmbclient.c | 12 ++--
source4/torture/local/dbspeed.c | 2 +-
source4/torture/local/local.c | 13 ++--
source4/torture/local/torture.c | 3 +-
source4/torture/nbench/nbench.c | 8 +-
source4/torture/nbt/dgram.c | 2 +-
source4/torture/nbt/nbt.c | 2 +-
source4/torture/nbt/query.c | 2 +-
source4/torture/nbt/register.c | 2 +-
source4/torture/nbt/wins.c | 2 +-
source4/torture/nbt/winsbench.c | 3 +-
source4/torture/nbt/winsreplication.c | 5 +-
source4/torture/ndr/ndr.c | 2 +-
source4/torture/ntp/ntp_signd.c | 6 +-
source4/torture/rap/printing.c | 2 +-
source4/torture/rap/rap.c | 6 +-
source4/torture/rap/rpc.c | 2 +-
source4/torture/rap/sam.c | 2 +-
source4/torture/raw/acls.c | 20 ++--
source4/torture/raw/lock.c | 8 +-
source4/torture/raw/open.c | 38 ++++----
source4/torture/raw/oplock.c | 80 +++++++++---------
source4/torture/raw/raw.c | 63 +++++++-------
source4/torture/raw/read.c | 4 +-
source4/torture/raw/rename.c | 2 +-
source4/torture/raw/search.c | 2 +-
source4/torture/raw/setfileinfo.c | 19 ++--
source4/torture/raw/streams.c | 29 +++---
source4/torture/raw/unlink.c | 4 +-
source4/torture/raw/write.c | 2 +-
source4/torture/rpc/atsvc.c | 2 +-
source4/torture/rpc/bind.c | 2 +-
source4/torture/rpc/browser.c | 2 +-
source4/torture/rpc/dfs.c | 2 +-
source4/torture/rpc/drsuapi.c | 5 +-
source4/torture/rpc/drsuapi_cracknames.c | 4 +-
source4/torture/rpc/dsgetinfo.c | 2 +-
source4/torture/rpc/dssetup.c | 2 +-
source4/torture/rpc/echo.c | 3 +-
source4/torture/rpc/epmapper.c | 4 +-
source4/torture/rpc/eventlog.c | 2 +-
source4/torture/rpc/forest_trust.c | 2 +-
source4/torture/rpc/frsapi.c | 2 +-
source4/torture/rpc/handles.c | 2 +-
source4/torture/rpc/initshutdown.c | 2 +-
source4/torture/rpc/lsa.c | 6 +-
source4/torture/rpc/lsa_lookup.c | 2 +-
source4/torture/rpc/netlogon.c | 6 +-
source4/torture/rpc/ntsvcs.c | 2 +-
source4/torture/rpc/object_uuid.c | 2 +-
source4/torture/rpc/oxidresolve.c | 3 +-
source4/torture/rpc/remact.c | 2 +-
source4/torture/rpc/remote_pac.c | 2 +-
source4/torture/rpc/rpc.c | 44 +++++-----
source4/torture/rpc/samba3rpc.c | 30 +++---
source4/torture/rpc/samr.c | 10 +-
source4/torture/rpc/samr_accessmask.c | 6 +-
source4/torture/rpc/session_key.c | 2 +-
source4/torture/rpc/spoolss.c | 8 +-
source4/torture/rpc/spoolss_access.c | 2 +-
source4/torture/rpc/spoolss_notify.c | 2 +-
source4/torture/rpc/spoolss_win.c | 2 +-
source4/torture/rpc/srvsvc.c | 2 +-
source4/torture/rpc/svcctl.c | 2 +-
source4/torture/rpc/unixinfo.c | 2 +-
source4/torture/rpc/winreg.c | 2 +-
source4/torture/rpc/wkssvc.c | 2 +-
source4/torture/smb2/acls.c | 2 +-
source4/torture/smb2/compound.c | 21 ++---
source4/torture/smb2/create.c | 24 +++---
source4/torture/smb2/dir.c | 20 ++--
source4/torture/smb2/durable_open.c | 12 ++--
source4/torture/smb2/lease.c | 12 ++--
source4/torture/smb2/lock.c | 44 +++++-----
source4/torture/smb2/notify.c | 32 ++++----
source4/torture/smb2/oplock.c | 74 ++++++++--------
source4/torture/smb2/read.c | 8 +-
source4/torture/smb2/smb2.c | 20 ++--
source4/torture/smb2/streams.c | 24 +++---
source4/torture/smbtorture.c | 14 ++--
source4/torture/unix/unix.c | 6 +-
source4/torture/winbind/struct_based.c | 40 ++++----
source4/torture/winbind/winbind.c | 2 +-
139 files changed, 728 insertions(+), 749 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/compression/testsuite.c b/lib/compression/testsuite.c
index 8c3c66a..ff7d892 100644
--- a/lib/compression/testsuite.c
+++ b/lib/compression/testsuite.c
@@ -69,7 +69,7 @@ static bool test_lzxpress(struct torture_context *test)
struct torture_suite *torture_local_compression(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "COMPRESSION");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "compression");
torture_suite_add_simple_test(suite, "lzxpress", test_lzxpress);
diff --git a/lib/nss_wrapper/testsuite.c b/lib/nss_wrapper/testsuite.c
index 9f0b1ca..3d3f748 100644
--- a/lib/nss_wrapper/testsuite.c
+++ b/lib/nss_wrapper/testsuite.c
@@ -945,7 +945,7 @@ static bool test_nwrap_duplicates(struct torture_context *tctx)
struct torture_suite *torture_local_nss_wrapper(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "NSS-WRAPPER");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "nss-wrapper");
torture_suite_add_simple_test(suite, "enumeration", test_nwrap_enumeration);
torture_suite_add_simple_test(suite, "reentrant enumeration", test_nwrap_reentrant_enumeration);
diff --git a/lib/socket_wrapper/testsuite.c b/lib/socket_wrapper/testsuite.c
index e6e08e3..9274e7f 100644
--- a/lib/socket_wrapper/testsuite.c
+++ b/lib/socket_wrapper/testsuite.c
@@ -95,7 +95,7 @@ static bool test_socket_wrapper_default_iface(struct torture_context *tctx)
struct torture_suite *torture_local_socket_wrapper(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
- "SOCKET-WRAPPER");
+ "socket-wrapper");
torture_suite_add_simple_test(suite, "socket_wrapper_dir", test_socket_wrapper_dir);
torture_suite_add_simple_test(suite, "socket", test_swrap_socket);
diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
index 5b8220c..95564eb 100644
--- a/lib/talloc/Makefile
+++ b/lib/talloc/Makefile
@@ -56,6 +56,9 @@ etags:
ctags:
$(WAF) ctags
+pydoctor:
+ $(WAF) pydoctor
+
bin/%:: FORCE
$(WAF) --targets=`basename $@`
FORCE:
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 49eac6e..b4cb84b 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -141,3 +141,10 @@ def reconfigure(ctx):
'''reconfigure if config scripts have changed'''
import samba_utils
samba_utils.reconfigure(ctx)
+
+
+def pydoctor(ctx):
+ '''build python apidocs'''
+ cmd='PYTHONPATH=bin/python pydoctor --project-name=talloc --project-url=http://talloc.samba.org/ --make-html --docformat=restructuredtext --introspect-c-modules --add-module bin/python/talloc.*'
+ print("Running: %s" % cmd)
+ os.system(cmd)
diff --git a/lib/tdr/testsuite.c b/lib/tdr/testsuite.c
index 1db7a1d..bea78f5 100644
--- a/lib/tdr/testsuite.c
+++ b/lib/tdr/testsuite.c
@@ -166,7 +166,7 @@ static bool test_push_charset(struct torture_context *tctx)
struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "tdr");
torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8);
torture_suite_add_simple_test(suite, "push_uint8", test_push_uint8);
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index f9aca91..991e161 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -146,7 +146,7 @@ static bool test_event_context(struct torture_context *test,
struct torture_suite *torture_local_event(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "EVENT");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "event");
const char **list = event_backend_list(suite);
int i;
diff --git a/lib/util/charset/tests/charset.c b/lib/util/charset/tests/charset.c
index 06acda8..72fd11b 100644
--- a/lib/util/charset/tests/charset.c
+++ b/lib/util/charset/tests/charset.c
@@ -246,7 +246,7 @@ static bool test_count_chars_m(struct torture_context *tctx)
struct torture_suite *torture_local_charset(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "charset");
torture_suite_add_simple_test(suite, "toupper_m", test_toupper_m);
torture_suite_add_simple_test(suite, "tolower_m", test_tolower_m);
diff --git a/lib/util/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c
index 2b6679e..a1a0d97 100644
--- a/lib/util/charset/tests/iconv.c
+++ b/lib/util/charset/tests/iconv.c
@@ -451,7 +451,7 @@ static bool test_string2key(struct torture_context *tctx)
struct torture_suite *torture_local_iconv(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "ICONV");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "iconv");
torture_suite_add_simple_test(suite, "string2key",
test_string2key);
diff --git a/lib/util/tests/asn1_tests.c b/lib/util/tests/asn1_tests.c
index 97f7756..5cc5146 100644
--- a/lib/util/tests/asn1_tests.c
+++ b/lib/util/tests/asn1_tests.c
@@ -264,7 +264,7 @@ static bool test_ber_read_partial_OID_String(struct torture_context *tctx)
/* LOCAL-ASN1 test suite creation */
struct torture_suite *torture_local_util_asn1(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "ASN1");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "asn1");
torture_suite_add_simple_test(suite, "ber_write_OID_String",
test_ber_write_OID_String);
diff --git a/lib/util/tests/data_blob.c b/lib/util/tests/data_blob.c
index 53330a4..bdccef2 100644
--- a/lib/util/tests/data_blob.c
+++ b/lib/util/tests/data_blob.c
@@ -85,7 +85,7 @@ static bool test_hex_string(struct torture_context *tctx)
struct torture_suite *torture_local_util_data_blob(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "DATABLOB");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "datablob");
torture_suite_add_simple_test(suite, "string", test_string);
torture_suite_add_simple_test(suite, "string_null", test_string_null);
diff --git a/lib/util/tests/dlinklist.c b/lib/util/tests/dlinklist.c
index 8816dba..8db0a02 100644
--- a/lib/util/tests/dlinklist.c
+++ b/lib/util/tests/dlinklist.c
@@ -124,7 +124,7 @@ static bool torture_local_dlinklist_simple(struct torture_context *tctx)
struct torture_suite *torture_local_dlinklist(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "DLINKLIST");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "dlinklist");
torture_suite_add_simple_test(suite, "dlinklist", torture_local_dlinklist_simple);
return suite;
}
diff --git a/lib/util/tests/file.c b/lib/util/tests/file.c
index 4aff0e9..c29e098 100644
--- a/lib/util/tests/file.c
+++ b/lib/util/tests/file.c
@@ -91,13 +91,12 @@ static bool test_afdgets(struct torture_context *tctx)
struct torture_suite *torture_local_util_file(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "FILE");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "file");
torture_suite_add_simple_test(suite, "file_load_save",
test_file_load_save);
- torture_suite_add_simple_test(suite, "afdgets",
- test_afdgets);
+ torture_suite_add_simple_test(suite, "afdgets", test_afdgets);
return suite;
}
diff --git a/lib/util/tests/genrand.c b/lib/util/tests/genrand.c
index 20a20ac..50d77bb 100644
--- a/lib/util/tests/genrand.c
+++ b/lib/util/tests/genrand.c
@@ -59,7 +59,7 @@ static bool test_generate_random_str(struct torture_context *tctx)
struct torture_suite *torture_local_genrand(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "GENRAND");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "genrand");
torture_suite_add_simple_test(suite, "reseed_callback", test_reseed_callback);
torture_suite_add_simple_test(suite, "check_password_quality", test_check_password_quality);
torture_suite_add_simple_test(suite, "generate_random_str", test_generate_random_str);
diff --git a/lib/util/tests/idtree.c b/lib/util/tests/idtree.c
index d89fb8c..ba7b2e7 100644
--- a/lib/util/tests/idtree.c
+++ b/lib/util/tests/idtree.c
@@ -115,7 +115,7 @@ static bool torture_local_idtree_simple(struct torture_context *tctx)
struct torture_suite *torture_local_idtree(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "IDTREE");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "idtree");
torture_suite_add_simple_test(suite, "idtree", torture_local_idtree_simple);
return suite;
}
diff --git a/lib/util/tests/parmlist.c b/lib/util/tests/parmlist.c
index c1bd69d..45e7ec3 100644
--- a/lib/util/tests/parmlist.c
+++ b/lib/util/tests/parmlist.c
@@ -94,7 +94,7 @@ static bool test_get_string_list(struct torture_context *tctx)
struct torture_suite *torture_local_util_parmlist(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "PARMLIST");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "parmlist");
torture_suite_add_simple_test(suite, "get_int", test_get_int);
torture_suite_add_simple_test(suite, "get_string", test_get_string);
diff --git a/lib/util/tests/str.c b/lib/util/tests/str.c
index 3bd6a02..6b38fea 100644
--- a/lib/util/tests/str.c
+++ b/lib/util/tests/str.c
@@ -94,7 +94,7 @@ static bool test_string_sub_talloc_multiple(struct torture_context *tctx)
struct torture_suite *torture_local_util_str(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "STR");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "str");
torture_suite_add_simple_test(suite, "string_sub_simple",
test_string_sub_simple);
diff --git a/lib/util/tests/strlist.c b/lib/util/tests/strlist.c
index 3a7f2a5..21b7b1d 100644
--- a/lib/util/tests/strlist.c
+++ b/lib/util/tests/strlist.c
@@ -469,7 +469,7 @@ static bool test_list_append_const(struct torture_context *tctx)
struct torture_suite *torture_local_util_strlist(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "STRLIST");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "strlist");
int i;
for (i = 0; i < ARRAY_SIZE(test_lists_shell_strings); i++) {
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index 78e8121..592f88f 100644
--- a/lib/util/tests/time.c
+++ b/lib/util/tests/time.c
@@ -100,7 +100,7 @@ static bool test_get_time_zone(struct torture_context *tctx)
struct torture_suite *torture_local_util_time(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "TIME");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "time");
torture_suite_add_simple_test(suite, "null_time", test_null_time);
torture_suite_add_simple_test(suite, "get_time_zone", test_get_time_zone);
diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c
index 200805e..c6ee531 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -678,7 +678,7 @@ static bool test_wbc_getgroups(struct torture_context *tctx)
struct torture_suite *torture_wbclient(void)
{
- struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "WBCLIENT");
+ struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "wbclient");
torture_suite_add_simple_test(suite, "wbcPing", test_wbc_ping);
torture_suite_add_simple_test(suite, "wbcPingDc", test_wbc_pingdc);
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 3c6699e..ed7799e 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -21,49 +21,49 @@ incdir=`dirname $0`
. $incdir/test_functions.sh
}
-base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE"
-base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2"
-base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK"
-base="$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
-base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1"
-base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID"
-base="$base BASE-XCOPY BASE-SAMBA3ERROR"
-
-raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
-raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
-raw="$raw RAW-SFILEINFO-BASE RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
-raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
-raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
-raw="$raw RAW-SAMBA3ROOTDIRFID RAW-SFILEINFO-END-OF-FILE"
-
-smb2="SMB2-LOCK SMB2-READ SMB2-COMPOUND SMB2-CONNECT SMB2-SCAN SMB2-SCANFIND"
-smb2="$smb2 SMB2-BENCH-OPLOCK"
-
-rpc="RPC-AUTHCONTEXT RPC-SAMBA3-BIND RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
-rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG"
-rpc="$rpc RPC-SAMBA3-GETALIASMEMBERSHIP-0"
-rpc="$rpc RPC-SAMBA3-NETLOGON RPC-SAMBA3-SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-rpc="$rpc RPC-SVCCTL RPC-NTSVCS RPC-WINREG RPC-EVENTLOG"
-rpc="$rpc RPC-SPOOLSS-PRINTSERVER RPC-SPOOLSS-WIN RPC-SPOOLSS-NOTIFY RPC-SPOOLSS-PRINTER"
-rpc="$rpc RPC-SPOOLSS-DRIVER"
-rpc="$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES"
-rpc="$rpc RPC-LSA-PRIVILEGES "
-rpc="$rpc RPC-SAMR RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS"
-rpc="$rpc RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-SAMR-MACHINE-AUTH"
-rpc="$rpc RPC-NETLOGON-S3 RPC-NETLOGON-ADMIN"
-rpc="$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 RPC-JOIN RPC-BIND"
-
-local="LOCAL-NSS-WRAPPER LOCAL-NDR"
-
-winbind="WINBIND-STRUCT WINBIND-WBCLIENT"
-
-rap="RAP-BASIC RAP-RPC RAP-PRINTING RAP-SAM"
-
-# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
-# config to allow guest access. I'm not sure whether this would break other
+base="base.attr base.charset base.chkpath base.defer_open base.delaywrite base.delete"
+base="$base base.deny1 base.deny2 base.deny3 base.denydos base.dir1 base.dir2"
+base="$base base.disconnect base.fdpass base.lock"
+base="$base base.mangle base.negnowait base.ntdeny1"
+base="$base base.ntdeny2 base.open base.openattr base.properties base.rename base.rw1"
+base="$base base.secleak base.tcon base.tcondev base.trans2 base.unlink base.vuid"
+base="$base base.xcopy base.samba3error"
+
+raw="raw.acls raw.chkpath raw.close raw.composite raw.context raw.eas"
+raw="$raw raw.ioctl raw.lock raw.mkdir raw.mux raw.notify raw.open raw.oplock"
+raw="$raw raw.qfileinfo raw.qfsinfo raw.read raw.rename raw.search raw.seek"
+raw="$raw raw.sfileinfo.base raw.sfileinfo.bug raw.streams raw.unlink raw.write"
+raw="$raw raw.samba3hide raw.samba3badpath raw.sfileinfo.rename"
+raw="$raw raw.samba3caseinsensitive raw.samba3posixtimedlock"
+raw="$raw raw.samba3rootdirfid raw.sfileinfo.end.of.file"
+
+smb2="smb2.lock smb2.read smb2.compound smb2.connect smb2.scan smb2.scanfind"
+smb2="$smb2 smb2.bench.oplock"
+
+rpc="rpc.authcontext rpc.samba3.bind rpc.samba3.srvsvc rpc.samba3.sharesec"
+rpc="$rpc rpc.samba3.spoolss rpc.samba3.wkssvc rpc.samba3.winreg"
+rpc="$rpc rpc.samba3.getaliasmembership.0"
+rpc="$rpc rpc.samba3.netlogon rpc.samba3.sessionkey rpc.samba3.getusername"
+rpc="$rpc rpc.svcctl rpc.ntsvcs rpc.winreg rpc.eventlog"
+rpc="$rpc rpc.spoolss.printserver rpc.spoolss.win rpc.spoolss.notify rpc.spoolss.printer"
+rpc="$rpc rpc.spoolss.driver"
+rpc="$rpc rpc.lsa.getuser rpc.lsa.lookupsids rpc.lsa.lookupnames"
+rpc="$rpc rpc.lsa.privileges "
+rpc="$rpc rpc.samr rpc.samr.users rpc.samr.users.privileges rpc.samr.passwords"
+rpc="$rpc rpc.samr.passwords.pwdlastset rpc.samr.large.dc rpc.samr.machine.auth"
+rpc="$rpc rpc.netlogon.s3 rpc.netlogon.admin"
+rpc="$rpc rpc.schannel rpc.schannel2 rpc.bench.schannel1 rpc.join rpc.bind"
+
+local="local.nss.wrapper local.ndr"
+
+winbind="winbind.struct winbind.wbclient"
+
+rap="rap.basic rap.rpc rap.printing rap.sam"
+
+# note: to enable the unix-whoami test, we need to change the default share
+# config to allow guest access. i'm not sure whether this would break other
# tests, so leaving it alone for now -- jpeach
-unix="UNIX-INFO2"
+unix="unix.info2"
tests="$base $raw $smb2 $rpc $unix $local $winbind $rap"
@@ -71,11 +71,11 @@ if test "x$POSIX_SUBTESTS" != "x" ; then
tests="$POSIX_SUBTESTS"
fi
-skipped="BASE-CHARSET BASE-TCONDEV"
-skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
-skipped="$skipped RAW-IOCTL"
-skipped="$skipped RAW-QFILEINFO RAW-QFSINFO"
-skipped="$skipped RAW-SFILEINFO-BASE"
+skipped="base.charset base.tcondev"
+skipped="$skipped raw.acls raw.composite raw.context"
+skipped="$skipped raw.ioctl"
+skipped="$skipped raw.qfileinfo raw.qfsinfo"
+skipped="$skipped raw.sfileinfo.base"
echo "WARNING: Skipping tests $skipped"
@@ -99,12 +99,12 @@ for t in $tests; do
fi
start=""
name="$t"
- if [ "$t" = "BASE-DELAYWRITE" ]; then
+ if [ "$t" = "base.delaywrite" ]; then
testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS --maximum-runtime=900 $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
else
testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
fi
- if [ "$t" = "RAW-CHKPATH" ]; then
+ if [ "$t" = "raw.chkpath" ]; then
echo "Testing with case sensitive"
testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS "$unc"case -U"$username"%"$password" $t || failed=`expr $failed + 1`
fi
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index e53981c..9457207 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -40,20 +40,13 @@ plantest() {
echo $cmdline "2>&1" "| ../selftest/filter-subunit --prefix \"$fullname.\""
}
-normalize_testname() {
- name=$1
- shift 1
- n=`echo $name | tr "A-Z-" "a-z."`
- echo "$n $@"
-}
-
TEST_FUNCTIONS_SH="INCLUDED"
testit() {
name=$1
shift 1
cmdline="$*"
- plantest "`normalize_testname $testitprefix$name`" $testitenv $cmdline
+ plantest "$testitprefix$name" $testitenv $cmdline
return
}
diff --git a/source4/auth/credentials/tests/simple.c b/source4/auth/credentials/tests/simple.c
index c059878..6c72275 100644
--- a/source4/auth/credentials/tests/simple.c
+++ b/source4/auth/credentials/tests/simple.c
@@ -106,8 +106,7 @@ static bool test_parse_string(struct torture_context *tctx)
struct torture_suite *torture_local_credentials(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx,
- "CREDENTIALS");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "credentials");
torture_suite_add_simple_test(suite, "init", test_init);
torture_suite_add_simple_test(suite, "init anonymous",
diff --git a/source4/dsdb/common/tests/dsdb_dn.c b/source4/dsdb/common/tests/dsdb_dn.c
index d01e858..bad649c 100644
--- a/source4/dsdb/common/tests/dsdb_dn.c
+++ b/source4/dsdb/common/tests/dsdb_dn.c
@@ -344,15 +344,15 @@ static bool torture_dsdb_dn_invalid(struct torture_context *torture)
struct torture_suite *torture_dsdb_dn(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "DSDB-DN");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "dsdb.dn");
if (suite == NULL) {
return NULL;
}
- torture_suite_add_simple_test(suite, "VALID", torture_dsdb_dn_valid);
- torture_suite_add_simple_test(suite, "INVALID", torture_dsdb_dn_invalid);
- torture_suite_add_simple_test(suite, "ATTRS", torture_dsdb_dn_attrs);
+ torture_suite_add_simple_test(suite, "valid", torture_dsdb_dn_valid);
+ torture_suite_add_simple_test(suite, "invalid", torture_dsdb_dn_invalid);
+ torture_suite_add_simple_test(suite, "attrs", torture_dsdb_dn_attrs);
suite->description = talloc_strdup(suite, "DSDB DN tests");
diff --git a/source4/dsdb/schema/tests/schema_syntax.c b/source4/dsdb/schema/tests/schema_syntax.c
index 0f939fe..326c94f 100644
--- a/source4/dsdb/schema/tests/schema_syntax.c
+++ b/source4/dsdb/schema/tests/schema_syntax.c
@@ -238,7 +238,7 @@ struct torture_suite *torture_dsdb_syntax(TALLOC_CTX *mem_ctx)
typedef bool (*pfn_run)(struct torture_context *, void *);
struct torture_tcase *tc;
- struct torture_suite *suite = torture_suite_create(mem_ctx, "DSDB-SYNTAX");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "dsdb.syntax");
if (suite == NULL) {
return NULL;
diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c
index 4db1fe7..4d0b6b4 100644
--- a/source4/lib/messaging/tests/irpc.c
+++ b/source4/lib/messaging/tests/irpc.c
@@ -271,7 +271,7 @@ static bool irpc_setup(struct torture_context *tctx, void **_data)
struct torture_suite *torture_local_irpc(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "IRPC");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "irpc");
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "irpc");
int i;
uint32_t *values = talloc_array(tcase, uint32_t, 5);
diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c
index bf6f13b..82fdf2f 100644
--- a/source4/lib/messaging/tests/messaging.c
+++ b/source4/lib/messaging/tests/messaging.c
@@ -136,7 +136,7 @@ static bool test_ping_speed(struct torture_context *tctx)
struct torture_suite *torture_local_messaging(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *s = torture_suite_create(mem_ctx, "MESSAGING");
+ struct torture_suite *s = torture_suite_create(mem_ctx, "messaging");
torture_suite_add_simple_test(s, "ping_speed", test_ping_speed);
return s;
--
Samba Shared Repository
More information about the samba-cvs
mailing list