sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-26 18:50:30 +03:00
Code

s4-smbtorture: Make test names lowercase and dot-separated.

Browse Source 
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@samba.org>
Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2010-12-11 03:26:31 +01:00
parent 68d97f8b49
commit 35fbc7bbda
137 changed files with 698 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/compression/testsuite.c
View File

@ -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);

2
lib/nss_wrapper/testsuite.c
View File

@ -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);

2
lib/socket_wrapper/testsuite.c
View File

@ -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);

2
lib/tdr/testsuite.c
View File

@ -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);

2
lib/tevent/testsuite.c
View File

@ -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;

2
lib/util/charset/tests/charset.c
View File

@ -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);

2
lib/util/charset/tests/iconv.c
View File

@ -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);

2
lib/util/tests/asn1_tests.c
View File

@ -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);

2
lib/util/tests/data_blob.c
View File

@ -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);

2
lib/util/tests/dlinklist.c
View File

@ -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;
}

5
lib/util/tests/file.c
View File

@ -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;
}

2
lib/util/tests/genrand.c
View File

@ -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);

2
lib/util/tests/idtree.c
View File

@ -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;
}

2
lib/util/tests/parmlist.c
View File

@ -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);

2
lib/util/tests/str.c
View File

@ -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);

2
lib/util/tests/strlist.c
View File

@ -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++) {

2
lib/util/tests/time.c
View File

@ -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);

2
nsswitch/libwbclient/tests/wbclient.c
View File

@ -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);

84
source3/script/tests/test_posix_s3.sh
View File

@ -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"
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"
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"
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"
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"
local="local.nss.wrapper local.ndr"
winbind="WINBIND-STRUCT WINBIND-WBCLIENT"
winbind="winbind.struct winbind.wbclient"
rap="RAP-BASIC RAP-RPC RAP-PRINTING RAP-SAM"
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
# 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

9
source3/selftest/tests.sh
View File

@ -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
}

3
source4/auth/credentials/tests/simple.c
View File

@ -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",

8
source4/dsdb/common/tests/dsdb_dn.c
View File

@ -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");

2
source4/dsdb/schema/tests/schema_syntax.c
View File

@ -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;

2
source4/lib/messaging/tests/irpc.c
View File

@ -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);

2
source4/lib/messaging/tests/messaging.c
View File

@ -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;
}

2
source4/lib/registry/tests/diff.c
View File

@ -276,7 +276,7 @@ static bool diff_setup_dotreg_tcase (struct torture_context *tctx, void **data)
struct torture_suite *torture_registry_diff(TALLOC_CTX *mem_ctx)
{
struct torture_tcase *tcase;
struct torture_suite *suite = torture_suite_create(mem_ctx, "DIFF");
struct torture_suite *suite = torture_suite_create(mem_ctx, "diff");
tcase = torture_suite_add_tcase(suite, "PReg");
torture_tcase_set_fixture(tcase, diff_setup_preg_tcase, NULL);

2
source4/lib/registry/tests/generic.c
View File

@ -154,7 +154,7 @@ static bool test_reg_val_description_nullname(struct torture_context *ctx)
struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
struct torture_suite *suite = torture_suite_create(mem_ctx, "registry");
torture_suite_add_simple_test(suite, "str_regtype",
test_str_regtype);
torture_suite_add_simple_test(suite, "reg_val_data_string dword",

2
source4/lib/registry/tests/hive.c
View File

@ -457,7 +457,7 @@ static bool test_dir_refuses_null_location(struct torture_context *tctx)
struct torture_suite *torture_registry_hive(TALLOC_CTX *mem_ctx)
{
struct torture_tcase *tcase;
struct torture_suite *suite = torture_suite_create(mem_ctx, "HIVE");
struct torture_suite *suite = torture_suite_create(mem_ctx, "hive");
torture_suite_add_simple_test(suite, "dir-refuses-null-location",
test_dir_refuses_null_location);

2
source4/lib/registry/tests/registry.c
View File

@ -579,7 +579,7 @@ static void tcase_add_tests(struct torture_tcase *tcase)
struct torture_suite *torture_registry_registry(TALLOC_CTX *mem_ctx)
{
struct torture_tcase *tcase;
struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
struct torture_suite *suite = torture_suite_create(mem_ctx, "registry");
tcase = torture_suite_add_tcase(suite, "local");
torture_tcase_set_fixture(tcase, setup_local_registry, NULL);

3
source4/lib/socket/testsuite.c
View File

@ -188,8 +188,7 @@ static bool test_tcp(struct torture_context *tctx)
struct torture_suite *torture_local_socket(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
"SOCKET");
struct torture_suite *suite = torture_suite_create(mem_ctx, "socket");
torture_suite_add_simple_test(suite, "udp", test_udp);
torture_suite_add_simple_test(suite, "tcp", test_tcp);

2
source4/libcli/resolve/testsuite.c
View File

@ -82,7 +82,7 @@ static bool test_sync_resolve(struct torture_context *tctx)
struct torture_suite *torture_local_resolve(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "RESOLVE");
struct torture_suite *suite = torture_suite_create(mem_ctx, "resolve");
torture_suite_add_simple_test(suite, "async", test_async_resolve);
torture_suite_add_simple_test(suite, "sync", test_sync_resolve);

2
source4/libcli/security/tests/sddl.c
View File

@ -93,7 +93,7 @@ static const char *examples[] = {
/* test a set of example SDDL strings */
struct torture_suite *torture_local_sddl(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "SDDL");
struct torture_suite *suite = torture_suite_create(mem_ctx, "sddl");
int i;
for (i = 0; i < ARRAY_SIZE(examples); i++) {

2
source4/librpc/tests/binding_string.c
View File

@ -162,7 +162,7 @@ static bool test_no_transport(struct torture_context *tctx)
struct torture_suite *torture_local_binding_string(TALLOC_CTX *mem_ctx)
{
int i;
struct torture_suite *suite = torture_suite_create(mem_ctx, "BINDING");
struct torture_suite *suite = torture_suite_create(mem_ctx, "binding");
for (i = 0; i < ARRAY_SIZE(test_strings); i++) {
torture_suite_add_simple_tcase_const(suite, test_strings[i],

2
source4/param/tests/loadparm.c
View File

@ -147,7 +147,7 @@ static bool test_lp_service(struct torture_context *tctx)
struct torture_suite *torture_local_loadparm(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "LOADPARM");
struct torture_suite *suite = torture_suite_create(mem_ctx, "loadparm");
torture_suite_add_simple_test(suite, "create", test_create);
torture_suite_add_simple_test(suite, "set_option", test_set_option);

2
source4/param/tests/share.c
View File

@ -198,7 +198,7 @@ static bool teardown(struct torture_context *tctx, void *data)
struct torture_suite *torture_local_share(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "SHARE");
struct torture_suite *suite = torture_suite_create(mem_ctx, "share");
struct torture_tcase *tcase;
share_init();

42
source4/selftest/knownfail
View File

@ -41,11 +41,11 @@ samba4.base.charset.*.Testing partial surrogate
.*net.api.delshare.* # DelShare isn't implemented yet
samba4.rap.*netservergetinfo
samba4.smb2.persistent.handles1
samba4.winbind.struct.*.SHOW_SEQUENCE # Not yet working in winbind
samba4.winbind.struct.*.GETPWENT # Not yet working in winbind
samba4.winbind.struct.*.SETPWENT # Not yet working in winbind
samba4.winbind.struct.*.LOOKUP_NAME_SID # Not yet working in winbind
samba4.winbind.struct.*.LIST_GROUPS
samba4.winbind.struct.*.show_sequence # Not yet working in winbind
samba4.winbind.struct.*.getpwent # Not yet working in winbind
samba4.winbind.struct.*.setpwent # Not yet working in winbind
samba4.winbind.struct.*.lookup_name_sid # Not yet working in winbind
samba4.winbind.struct.*.list_groups
samba4.*base.delaywrite.*update of write time and SMBwrite truncate$
samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand$
samba4.*base.delaywrite.*delayed update of write time 3a$
@ -60,23 +60,23 @@ samba4.ntvfs.cifs.base.maximum_allowed
samba4.base.createx_access # this test is broken for non-administrator users
samba4.smb2.oplock # oplocks in the s4 SMB2 server are a mess
samba4.raw.lock.*.async # bug 6960
samba4.smb2.lock.*.MULTIPLE-UNLOCK # bug 6959
samba4.raw.sfileinfo.*.END-OF-FILE # bug 6962
samba4.raw.oplock.*.BATCH22 # bug 6963
samba4.smb2.lock.*.multiple-unlock # bug 6959
samba4.raw.sfileinfo.*.end-of-file # bug 6962
samba4.raw.oplock.*.batch22 # bug 6963
samba4.raw.lock.*.zerobyteread # bug 6974
samba4.smb2.lock.*.ZEROBYTEREAD # bug 6974
samba4.raw.streams.*.DELETE
samba4.raw.streams.*.CREATEDISP
samba4.raw.streams.*.SUMTAB
samba4.raw.acls.*.CREATE_DIR
samba4.raw.acls.*.CREATE_FILE
samba4.smb2.create.*.ACLDIR
samba4.smb2.acls.*.GENERIC
samba4.smb2.acls.*.INHERITFLAGS
samba4.smb2.acls.*.OWNER
samba4.smb2.compound.*.RELATED1
samba4.smb2.compound.*.RELATED2
samba4.smb2.compound.*.INVALID2
samba4.smb2.lock.*.zerobyteread # bug 6974
samba4.raw.streams.*.delete
samba4.raw.streams.*.createdisp
samba4.raw.streams.*.sumtab
samba4.raw.acls.*.create_dir
samba4.raw.acls.*.create_file
samba4.smb2.create.*.acldir
samba4.smb2.acls.*.generic
samba4.smb2.acls.*.inheritflags
samba4.smb2.acls.*.owner
samba4.smb2.compound.*.related1
samba4.smb2.compound.*.related2
samba4.smb2.compound.*.invalid2
samba4.ldap.acl.*.search.* # ACL search behaviour not enabled by default
samba4.ldap.acl.*.ntSecurityDescriptor.* # ACL extended checks on search not enabled by default

127
source4/selftest/tests.py
View File

@ -100,12 +100,6 @@ def skiptestsuite(name, reason):
print "skipping %s (%s)" % (name, reason)
def normalize_testname(name):
"""Normalize a smbtorture test suite name.
"""
return name.lower().replace(" ", "_").replace("-", ".")
def planperltestsuite(name, path):
"""Run a perl test suite.
@ -124,8 +118,9 @@ def planpythontestsuite(env, module):
else:
plantestsuite_idlist(module, env, "PYTHONPATH=$PYTHONPATH:%s/../lib/subunit/python:%s/../lib/testtools %s -m subunit.run $LISTOPT %s" % (samba4srcdir, samba4srcdir, python, module))
def plansmbtorturetestsuite(name, env, options):
modname = "samba4.%s" % normalize_testname(name)
modname = "samba4.%s" % name
cmdline = "%s %s %s" % (valgrindify(smb4torture), options, name)
plantestsuite_loadlist(modname, env, cmdline)
@ -195,7 +190,7 @@ for options in ['-U"$USERNAME%$PASSWORD"']:
plantestsuite("samba4.ldb.ldapi with options %s(dc:local)" % options, "dc:local",
"%s/test_ldb.sh ldapi $PREFIX_ABS/dc/private/ldapi %s" % (bbdir, options))
for t in smb4torture_testsuites("LDAP-"):
for t in smb4torture_testsuites("ldap."):
plansmbtorturetestsuite(t, "dc", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
ldbdir = os.path.join(samba4srcdir, "lib/ldb")
@ -211,17 +206,17 @@ else:
# add tests to this list as they start passing, so we test
# that they stay passing
ncacn_np_tests = ["RPC-SCHANNEL", "RPC-JOIN", "RPC-LSA", "RPC-DSSETUP", "RPC-ALTERCONTEXT", "RPC-MULTIBIND", "RPC-NETLOGON", "RPC-HANDLES", "RPC-SAMSYNC", "RPC-SAMBA3-SESSIONKEY", "RPC-SAMBA3-GETUSERNAME", "RPC-SAMBA3-LSA", "RPC-SAMBA3-BIND", "RPC-SAMBA3-NETLOGON", "RPC-ASYNCBIND", "RPC-LSALOOKUP", "RPC-LSA-GETUSER", "RPC-SCHANNEL2", "RPC-AUTHCONTEXT"]
ncalrpc_tests = ["RPC-SCHANNEL", "RPC-JOIN", "RPC-LSA", "RPC-DSSETUP", "RPC-ALTERCONTEXT", "RPC-MULTIBIND", "RPC-NETLOGON", "RPC-DRSUAPI", "RPC-ASYNCBIND", "RPC-LSALOOKUP", "RPC-LSA-GETUSER", "RPC-SCHANNEL2", "RPC-AUTHCONTEXT"]
drs_rpc_tests = smb4torture_testsuites("DRS-RPC")
ncacn_ip_tcp_tests = ["RPC-SCHANNEL", "RPC-JOIN", "RPC-LSA", "RPC-DSSETUP", "RPC-ALTERCONTEXT", "RPC-MULTIBIND", "RPC-NETLOGON", "RPC-HANDLES", "RPC-ASYNCBIND", "RPC-LSALOOKUP", "RPC-LSA-GETUSER", "RPC-SCHANNEL2", "RPC-AUTHCONTEXT", "RPC-OBJECTUUID"] + drs_rpc_tests
slow_ncacn_np_tests = ["RPC-SAMLOGON", "RPC-SAMR-USERS", "RPC-SAMR-LARGE-DC", "RPC-SAMR-USERS-PRIVILEGES", "RPC-SAMR-PASSWORDS", "RPC-SAMR-PASSWORDS-PWDLASTSET"]
slow_ncacn_ip_tcp_tests = ["RPC-SAMR", "RPC-CRACKNAMES"]
ncacn_np_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.handles", "rpc.samsync", "rpc.samba3-sessionkey", "rpc.samba3-getusername", "rpc.samba3-lsa", "rpc.samba3-bind", "rpc.samba3-netlogon", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
ncalrpc_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.drsuapi", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
drs_rpc_tests = smb4torture_testsuites("drs.rpc")
ncacn_ip_tcp_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.handles", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext", "rpc.objectuuid"] + drs_rpc_tests
slow_ncacn_np_tests = ["rpc.samlogon", "rpc.samr.users", "rpc.samr.large-dc", "rpc.samr.users.privileges", "rpc.samr.passwords", "rpc.samr.passwords.pwdlastset"]
slow_ncacn_ip_tcp_tests = ["rpc.samr", "rpc.cracknames"]
all_rpc_tests = ncalrpc_tests + ncacn_np_tests + ncacn_ip_tcp_tests + slow_ncacn_np_tests + slow_ncacn_ip_tcp_tests + ["RPC-LSA-SECRETS", "RPC-PAC", "RPC-SAMBA3-SHARESEC", "RPC-COUNTCALLS"]
all_rpc_tests = ncalrpc_tests + ncacn_np_tests + ncacn_ip_tcp_tests + slow_ncacn_np_tests + slow_ncacn_ip_tcp_tests + ["rpc.lsa.secrets", "rpc.pac", "rpc.samba3-sharesec", "rpc.countcalls"]
# Make sure all tests get run
rpc_tests = smb4torture_testsuites("RPC-")
rpc_tests = smb4torture_testsuites("rpc.")
auto_rpc_tests = filter(lambda t: t not in all_rpc_tests, rpc_tests)
for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
@ -235,15 +230,15 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
elif transport == "ncacn_ip_tcp":
tests = ncacn_ip_tcp_tests
for t in tests:
plantestsuite_loadlist("samba4.%s on %s with %s" % (normalize_testname(t), transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
plantestsuite_loadlist("samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=torture:share=tmp', 'RPC-SAMBA3-SHARESEC'])
plantestsuite_loadlist("samba4.%s on %s with %s" % (t, transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
plantestsuite_loadlist("samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=torture:share=tmp', 'rpc.samba3-sharesec'])
for bindoptions in [""] + validate_list + ["bigendian"]:
for t in auto_rpc_tests:
plantestsuite_loadlist("samba4.%s with %s" % (normalize_testname(t), bindoptions), "dc", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions), "dc", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
t = "RPC-COUNTCALLS"
plantestsuite_loadlist("samba4.%s" % normalize_testname(t), "dc:local", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
t = "rpc.countcalls"
plantestsuite_loadlist("samba4.%s" % t, "dc:local", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
for transport in ["ncacn_np", "ncacn_ip_tcp"]:
env = "dc"
@ -252,14 +247,14 @@ for transport in ["ncacn_np", "ncacn_ip_tcp"]:
elif transport == "ncacn_ip_tcp":
tests = slow_ncacn_ip_tcp_tests
for t in tests:
plantestsuite_loadlist("samba4.%s on %s" % (normalize_testname(t), transport), env, [valgrindify(smb4torture), "%s:$SERVER" % transport, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
plantestsuite_loadlist("samba4.%s on %s" % (t, transport), env, [valgrindify(smb4torture), "%s:$SERVER" % transport, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
# Tests for the DFS referral calls implementation
for t in smb4torture_testsuites("DFS-"):
for t in smb4torture_testsuites("dfs."):
plansmbtorturetestsuite(t, "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
# Tests for the NET API (NET-API-BECOME-DC tested below against all the roles)
net_tests = filter(lambda x: "NET-API-BECOME-DC" not in x, smb4torture_testsuites("NET-"))
# Tests for the NET API (net.api.become.dc tested below against all the roles)
net_tests = filter(lambda x: "net.api.become.dc" not in x, smb4torture_testsuites("net."))
for t in net_tests:
plansmbtorturetestsuite(t, "dc", '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
@ -281,26 +276,26 @@ for ntlmoptions in [
"-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes",
"-k no --option=usespnego=no"]:
name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions)
plantestsuite_loadlist("samba4.%s" % name, "dc", [smb4torture, "%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'RPC-LSA-SECRETS'])
plantestsuite_loadlist("samba4.%s" % name, "dc", [smb4torture, "%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
transports = ["ncacn_np", "ncacn_ip_tcp"]
#Kerberos varies between functional levels, so it is important to check this on all of them
for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
transport = "ncacn_np"
plantestsuite_loadlist("samba4.rpc.pac on %s" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-PAC'])
plantestsuite_loadlist("samba4.rpc.pac on %s" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.pac'])
for transport in transports:
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'RPC-LSA-SECRETS'])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use target principal" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:target_hostname=$NETBIOSNAME', 'RPC-LSA-SECRETS'])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=gensec:fake_gssapi_krb5=yes", '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "RPC-LSA-SECRETS-none*"])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login, use target principal" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:fake_gssapi_krb5=yes', '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "RPC-LSA-SECRETS-none*"])
plantestsuite_loadlist("samba4.rpc.echo on %s" % (transport, ), env, [smb4torture, "%s:$SERVER[]" % (transport,), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use target principal" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=gensec:fake_gssapi_krb5=yes", '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "rpc.lsa.secrets.none*"])
plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login, use target principal" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:fake_gssapi_krb5=yes', '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "rpc.lsa.secrets.none*"])
plantestsuite_loadlist("samba4.rpc.echo on %s" % (transport, ), env, [smb4torture, "%s:$SERVER[]" % (transport,), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
# Echo tests test bulk Kerberos encryption of DCE/RPC
for bindoptions in ["connect", "spnego", "spnego,sign", "spnego,seal"] + validate_list + ["padcheck", "bigendian", "bigendian,seal"]:
echooptions = "--option=socket:testnonblock=True --option=torture:quick=yes -k yes"
plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, echooptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
plansmbtorturetestsuite("NET-API-BECOME-DC", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, echooptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
plansmbtorturetestsuite("net.api.become.dc", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
for transport in transports:
for bindoptions in ["sign", "seal"]:
@ -318,36 +313,36 @@ for transport in transports:
env = "dc:local"
else:
env = "dc"
plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, ntlmoptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, ntlmoptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc", [smb4torture, 'ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc", [smb4torture, 'ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'NTP-SIGND'])
plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'ntp.signd'])
# Tests against the NTVFS POSIX backend
ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"]
smb2 = smb4torture_testsuites("SMB2-")
smb2 = smb4torture_testsuites("smb2.")
#The QFILEINFO-IPC test needs to be on ipc$
raw = filter(lambda x: "RAW-QFILEINFO-IPC" not in x, smb4torture_testsuites("RAW-"))
base = smb4torture_testsuites("BASE-")
raw = filter(lambda x: "raw.qfileinfo.ipc" not in x, smb4torture_testsuites("raw."))
base = smb4torture_testsuites("base.")
for t in base + raw + smb2:
plansmbtorturetestsuite(t, "dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD' + " " + " ".join(ntvfsargs))
plansmbtorturetestsuite("RAW-QFILEINFO-IPC", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
plansmbtorturetestsuite("raw.qfileinfo.ipc", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
for t in smb4torture_testsuites("RAP-"):
for t in smb4torture_testsuites("rap."):
plansmbtorturetestsuite(t, "dc", '//$SERVER/IPC\$ -U$USERNAME%$PASSWORD')
# Tests against the NTVFS CIFS backend
for t in base + raw:
plantestsuite_loadlist("samba4.ntvfs.cifs.%s" % normalize_testname(t), "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD'] + ntvfsargs + [t])
plantestsuite_loadlist("samba4.ntvfs.cifs.%s" % t, "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD'] + ntvfsargs + [t])
plansmbtorturetestsuite('ECHO-UDP', 'dc:local', '//$SERVER/whatever')
# Local tests
for t in smb4torture_testsuites("LOCAL-"):
for t in smb4torture_testsuites("local."):
plansmbtorturetestsuite(t, "none", "ncalrpc:")
tdbtorture4 = binpath("tdbtorture")
@ -356,7 +351,7 @@ if os.path.exists(tdbtorture4):
else:
skiptestsuite("tdb.stress", "Using system TDB, tdbtorture not available")
plansmbtorturetestsuite("DRS-UNIT", "none", "ncalrpc:")
plansmbtorturetestsuite("drs.unit", "none", "ncalrpc:")
# Pidl tests
for f in sorted(os.listdir(os.path.join(samba4srcdir, "../pidl/tests"))):
@ -389,19 +384,19 @@ plantestsuite("samba4.blackbox.wbinfo(member:local)", "member:local", [os.path.j
plantestsuite("samba4.blackbox.chgdcpass(dc)", "dc", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "LOCALDC\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/dc'])
# Tests using the "Simple" NTVFS backend
for t in ["BASE-RW1"]:
plantestsuite_loadlist("samba4.ntvfs.simple.%s" % normalize_testname(t), "dc", [valgrindify(smb4torture), "//$SERVER/simple", '-U$USERNAME%$PASSWORD', t])
for t in ["base.rw1"]:
plantestsuite_loadlist("samba4.ntvfs.simple.%s" % t, "dc", [valgrindify(smb4torture), "//$SERVER/simple", '-U$USERNAME%$PASSWORD', t])
# Domain Member Tests
plantestsuite_loadlist("samba4.rpc.echo against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'RPC-ECHO'])
plantestsuite_loadlist("samba4.rpc.echo against member server with domain creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', 'RPC-ECHO'])
plantestsuite_loadlist("samba4.rpc.samr against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "RPC-SAMR"])
plantestsuite_loadlist("samba4.rpc.samr.users against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "RPC-SAMR-USERS"])
plantestsuite_loadlist("samba4.rpc.samr.passwords against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "RPC-SAMR-PASSWORDS"])
plantestsuite_loadlist("samba4.rpc.echo against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'rpc.echo'])
plantestsuite_loadlist("samba4.rpc.echo against member server with domain creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', 'rpc.echo'])
plantestsuite_loadlist("samba4.rpc.samr against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr"])
plantestsuite_loadlist("samba4.rpc.samr.users against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr.users"])
plantestsuite_loadlist("samba4.rpc.samr.passwords against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr.passwords"])
plantestsuite("samba4.blackbox.smbclient against member server with local creds", "member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX'])
# RPC Proxy
plantestsuite_loadlist("samba4.rpc.echo against rpc proxy with domain creds", "rpc_proxy", [valgrindify(smb4torture), 'ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', "RPC-ECHO"])
plantestsuite_loadlist("samba4.rpc.echo against rpc proxy with domain creds", "rpc_proxy", [valgrindify(smb4torture), 'ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', "rpc.echo"])
# Tests SMB signing
for mech in [
@ -413,7 +408,7 @@ for mech in [
for signing in ["--signing=on", "--signing=required"]:
signoptions = "%s %s" % (mech, signing)
name = "smb.signing on with %s" % signoptions
plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'BASE-XCOPY'])
plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
for mech in [
"-k no",
@ -423,7 +418,7 @@ for mech in [
"-k yes --option=gensec:fake_gssapi_krb5=yes --option=gensec:gssapi_krb5=no"]:
signoptions = "%s --signing=off" % mech
name = "smb.signing on with %s" % signoptions
plantestsuite_loadlist("samba4.%s domain-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'BASE-XCOPY'])
plantestsuite_loadlist("samba4.%s domain-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
for mech in [
"-k no",
@ -431,19 +426,19 @@ for mech in [
"-k no --option=gensec:spengo=no"]:
signoptions = "%s --signing=off" % mech
name = "smb.signing on with %s" % signoptions
plantestsuite_loadlist("samba4.%s local-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'BASE-XCOPY'])
plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'BASE-XCOPY'])
plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'BASE-XCOPY'])
plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'BASE-XCOPY'])
plantestsuite_loadlist("samba4.%s local-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy'])
plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy'])
plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy'])
nbt_tests = smb4torture_testsuites("NBT-")
nbt_tests = smb4torture_testsuites("nbt.")
for t in nbt_tests:
plansmbtorturetestsuite(t, "dc", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
wb_opts = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=1\"", "--option=\"torture:winbindd_separator=/\"", "--option=\"torture:winbindd_netbios_name=$SERVER\"", "--option=\"torture:winbindd_netbios_domain=$DOMAIN\""]
winbind_struct_tests = smb4torture_testsuites("WINBIND-STRUCT")
winbind_ndr_tests = smb4torture_testsuites("WINBIND-NDR")
winbind_struct_tests = smb4torture_testsuites("winbind.struct")
winbind_ndr_tests = smb4torture_testsuites("winbind.ndr")
for env in ["dc", "member"]:
for t in winbind_struct_tests:
plansmbtorturetestsuite(t, env, "%s //_none_/_none_" % " ".join(wb_opts))
@ -529,10 +524,10 @@ plansambapythontestsuite("samba4.drs.fsmo.python(vampire_dc)", "vampire_dc", os.
plansambapythontestsuite("samba4.drs.repl_schema.python(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'torture/drs/python'), "repl_schema", environ={'DC1': "$DC_SERVER", 'DC2': '$VAMPIRE_DC_SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
# This makes sure we test the rid allocation code
t = "RPC-SAMR-LARGE-DC"
plantestsuite_loadlist("samba4.%s.one" % normalize_testname(t), "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
plantestsuite_loadlist("samba4.%s.two" % normalize_testname(t), "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
t = "rpc.samr.large-dc"
plantestsuite_loadlist("samba4.%s.one" % t, "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
plantestsuite_loadlist("samba4.%s.two" % t, "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
# some RODC testing
plantestsuite_loadlist("samba4.rpc.echo", "rodc", [smb4torture, 'ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '-W' '$DOMAIN', 'RPC-ECHO'])
plantestsuite_loadlist("samba4.rpc.echo", "rodc", [smb4torture, 'ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '-W' '$DOMAIN', 'rpc.echo'])
plantestsuite("samba4.blackbox.provision-backend.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])

3
source4/torture/auth/ntlmssp.c
View File

@ -151,8 +151,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
struct torture_suite *torture_ntlmssp(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
"NTLMSSP");
struct torture_suite *suite = torture_suite_create(mem_ctx, "ntlmssp");
torture_suite_add_simple_test(suite, "NTLMSSP self check",
torture_ntlmssp_self_check);

2
source4/torture/auth/pac.c
View File

@ -730,7 +730,7 @@ static bool torture_pac_saved_check(struct torture_context *tctx)
struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "PAC");
struct torture_suite *suite = torture_suite_create(mem_ctx, "pac");
torture_suite_add_simple_test(suite, "self check",
torture_pac_self_check);

2
source4/torture/basic/aliases.c
View File

@ -383,7 +383,7 @@ static bool setpathinfo_aliases(struct torture_context *tctx,
/* look for aliased info levels in trans2 calls */
struct torture_suite *torture_trans2_aliases(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "ALIASES");
struct torture_suite *suite = torture_suite_create(mem_ctx, "aliases");
torture_suite_add_1smb_test(suite, "QFILEINFO aliases", qfsinfo_aliases);
torture_suite_add_1smb_test(suite, "QFSINFO aliases", qfileinfo_aliases);

96
source4/torture/basic/base.c
View File

@ -1869,61 +1869,61 @@ static bool run_birthtimetest(struct torture_context *tctx,
NTSTATUS torture_base_init(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "BASE");
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "base");
torture_suite_add_2smb_test(suite, "FDPASS", run_fdpasstest);
torture_suite_add_2smb_test(suite, "fdpass", run_fdpasstest);
torture_suite_add_suite(suite, torture_base_locktest(suite));
torture_suite_add_1smb_test(suite, "UNLINK", torture_unlinktest);
torture_suite_add_1smb_test(suite, "ATTR", run_attrtest);
torture_suite_add_1smb_test(suite, "TRANS2", run_trans2test);
torture_suite_add_1smb_test(suite, "BIRTHTIME", run_birthtimetest);
torture_suite_add_simple_test(suite, "NEGNOWAIT", run_negprot_nowait);
torture_suite_add_1smb_test(suite, "DIR1", torture_dirtest1);
torture_suite_add_1smb_test(suite, "DIR2", torture_dirtest2);
torture_suite_add_1smb_test(suite, "DENY1", torture_denytest1);
torture_suite_add_2smb_test(suite, "DENY2", torture_denytest2);
torture_suite_add_2smb_test(suite, "DENY3", torture_denytest3);
torture_suite_add_1smb_test(suite, "DENYDOS", torture_denydos_sharing);
torture_suite_add_smb_multi_test(suite, "NTDENY1", torture_ntdenytest1);
torture_suite_add_2smb_test(suite, "NTDENY2", torture_ntdenytest2);
torture_suite_add_1smb_test(suite, "TCON", run_tcon_test);
torture_suite_add_1smb_test(suite, "TCONDEV", run_tcon_devtype_test);
torture_suite_add_1smb_test(suite, "VUID", run_vuidtest);
torture_suite_add_2smb_test(suite, "RW1", run_readwritetest);
torture_suite_add_2smb_test(suite, "OPEN", run_opentest);
torture_suite_add_smb_multi_test(suite, "DEFER_OPEN", run_deferopen);
torture_suite_add_1smb_test(suite, "XCOPY", run_xcopy);
torture_suite_add_1smb_test(suite, "IOMETER", run_iometer);
torture_suite_add_1smb_test(suite, "RENAME", torture_test_rename);
torture_suite_add_1smb_test(suite, "unlink", torture_unlinktest);
torture_suite_add_1smb_test(suite, "attr", run_attrtest);
torture_suite_add_1smb_test(suite, "trans2", run_trans2test);
torture_suite_add_1smb_test(suite, "birthtime", run_birthtimetest);
torture_suite_add_simple_test(suite, "negnowait", run_negprot_nowait);
torture_suite_add_1smb_test(suite, "dir1", torture_dirtest1);
torture_suite_add_1smb_test(suite, "dir2", torture_dirtest2);
torture_suite_add_1smb_test(suite, "deny1", torture_denytest1);
torture_suite_add_2smb_test(suite, "deny2", torture_denytest2);
torture_suite_add_2smb_test(suite, "deny3", torture_denytest3);
torture_suite_add_1smb_test(suite, "denydos", torture_denydos_sharing);
torture_suite_add_smb_multi_test(suite, "ntdeny1", torture_ntdenytest1);
torture_suite_add_2smb_test(suite, "ntdeny2", torture_ntdenytest2);
torture_suite_add_1smb_test(suite, "tcon", run_tcon_test);
torture_suite_add_1smb_test(suite, "tcondev", run_tcon_devtype_test);
torture_suite_add_1smb_test(suite, "vuid", run_vuidtest);
torture_suite_add_2smb_test(suite, "rw1", run_readwritetest);
torture_suite_add_2smb_test(suite, "open", run_opentest);
torture_suite_add_smb_multi_test(suite, "defer_open", run_deferopen);
torture_suite_add_1smb_test(suite, "xcopy", run_xcopy);
torture_suite_add_1smb_test(suite, "iometer", run_iometer);
torture_suite_add_1smb_test(suite, "rename", torture_test_rename);
torture_suite_add_suite(suite, torture_test_delete());
torture_suite_add_1smb_test(suite, "PROPERTIES", torture_test_properties);
torture_suite_add_1smb_test(suite, "MANGLE", torture_mangle);
torture_suite_add_1smb_test(suite, "OPENATTR", torture_openattrtest);
torture_suite_add_1smb_test(suite, "WINATTR", torture_winattrtest);
torture_suite_add_1smb_test(suite, "properties", torture_test_properties);
torture_suite_add_1smb_test(suite, "mangle", torture_mangle);
torture_suite_add_1smb_test(suite, "openattr", torture_openattrtest);
torture_suite_add_1smb_test(suite, "winattr", torture_winattrtest);
torture_suite_add_suite(suite, torture_charset(suite));
torture_suite_add_1smb_test(suite, "CHKPATH", torture_chkpath_test);
torture_suite_add_1smb_test(suite, "SECLEAK", torture_sec_leak);
torture_suite_add_simple_test(suite, "DISCONNECT", torture_disconnect);
torture_suite_add_1smb_test(suite, "chkpath", torture_chkpath_test);
torture_suite_add_1smb_test(suite, "secleak", torture_sec_leak);
torture_suite_add_simple_test(suite, "disconnect", torture_disconnect);
torture_suite_add_suite(suite, torture_delay_write());
torture_suite_add_simple_test(suite, "SAMBA3ERROR", torture_samba3_errorpaths);
torture_suite_add_1smb_test(suite, "CASETABLE", torture_casetable);
torture_suite_add_1smb_test(suite, "UTABLE", torture_utable);
torture_suite_add_simple_test(suite, "SMB", torture_smb_scan);
torture_suite_add_simple_test(suite, "samba3error", torture_samba3_errorpaths);
torture_suite_add_1smb_test(suite, "casetable", torture_casetable);
torture_suite_add_1smb_test(suite, "utable", torture_utable);
torture_suite_add_simple_test(suite, "smb", torture_smb_scan);
torture_suite_add_suite(suite, torture_trans2_aliases(suite));
torture_suite_add_1smb_test(suite, "TRANS2-SCAN", torture_trans2_scan);
torture_suite_add_1smb_test(suite, "NTTRANS", torture_nttrans_scan);
torture_suite_add_1smb_test(suite, "CREATEX_ACCESS", torture_createx_access);
torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_FILE", torture_createx_sharemodes_file);
torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_DIR", torture_createx_sharemodes_dir);
torture_suite_add_1smb_test(suite, "MAXIMUM_ALLOWED", torture_maximum_allowed);
torture_suite_add_1smb_test(suite, "trans2-scan", torture_trans2_scan);
torture_suite_add_1smb_test(suite, "nttrans", torture_nttrans_scan);
torture_suite_add_1smb_test(suite, "createx_access", torture_createx_access);
torture_suite_add_2smb_test(suite, "createx_sharemodes_file", torture_createx_sharemodes_file);
torture_suite_add_2smb_test(suite, "createx_sharemodes_dir", torture_createx_sharemodes_dir);
torture_suite_add_1smb_test(suite, "maximum_allowed", torture_maximum_allowed);
torture_suite_add_simple_test(suite, "BENCH-HOLDCON", torture_holdcon);
torture_suite_add_1smb_test(suite, "BENCH-HOLDOPEN", torture_holdopen);
torture_suite_add_simple_test(suite, "BENCH-READWRITE", run_benchrw);
torture_suite_add_smb_multi_test(suite, "BENCH-TORTURE", run_torture);
torture_suite_add_1smb_test(suite, "SCAN-PIPE_NUMBER", run_pipe_number);
torture_suite_add_1smb_test(suite, "SCAN-IOCTL", torture_ioctl_test);
torture_suite_add_smb_multi_test(suite, "SCAN-MAXFID", run_maxfidtest);
torture_suite_add_simple_test(suite, "bench-holdcon", torture_holdcon);
torture_suite_add_1smb_test(suite, "bench-holdopen", torture_holdopen);
torture_suite_add_simple_test(suite, "bench-readwrite", run_benchrw);
torture_suite_add_smb_multi_test(suite, "bench-torture", run_torture);
torture_suite_add_1smb_test(suite, "scan-pipe_number", run_pipe_number);
torture_suite_add_1smb_test(suite, "scan-ioctl", torture_ioctl_test);
torture_suite_add_smb_multi_test(suite, "scan-maxfid", run_maxfidtest);
suite->description = talloc_strdup(suite,
"Basic SMB tests (imported from the original smbtorture)");

2
source4/torture/basic/charset.c
View File

@ -197,7 +197,7 @@ static bool test_widea(struct torture_context *tctx,
struct torture_suite *torture_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_1smb_test(suite, "Testing composite character (a umlaut)", test_composed);
torture_suite_add_1smb_test(suite, "Testing naked diacritical (umlaut)", test_diacritical);

2
source4/torture/basic/delaywrite.c
View File

@ -3102,7 +3102,7 @@ static bool test_delayed_write_update7(struct torture_context *tctx, struct smbc
*/
struct torture_suite *torture_delay_write(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "DELAYWRITE");
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "delaywrite");
torture_suite_add_2smb_test(suite, "finfo update on close", test_finfo_after_write);
torture_suite_add_1smb_test(suite, "delayed update of write time", test_delayed_write_update);

3
source4/torture/basic/delete.c
View File

@ -1586,8 +1586,7 @@ static bool deltest23(struct torture_context *tctx,
struct torture_suite *torture_test_delete(void)
{
struct torture_suite *suite = torture_suite_create(
talloc_autofree_context(),
"DELETE");
talloc_autofree_context(), "delete");
torture_suite_add_2smb_test(suite, "deltest1", deltest1);
torture_suite_add_2smb_test(suite, "deltest2", deltest2);

2
source4/torture/basic/locking.c
View File

@ -802,7 +802,7 @@ fail:
struct torture_suite *torture_base_locktest(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCK");
struct torture_suite *suite = torture_suite_create(mem_ctx, "lock");
torture_suite_add_2smb_test(suite, "LOCK1", torture_locktest1);
torture_suite_add_1smb_test(suite, "LOCK2", torture_locktest2);
torture_suite_add_2smb_test(suite, "LOCK3", torture_locktest3);

4
source4/torture/dfs/domaindfs.c
View File

@ -466,8 +466,8 @@ static bool test_low_referral_level(struct torture_context *tctx,
NTSTATUS torture_dfs_init(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "DFS");
struct torture_suite *suite_basic = torture_suite_create(suite, "DOMAIN");
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "dfs");
struct torture_suite *suite_basic = torture_suite_create(suite, "domain");
torture_suite_add_suite(suite, suite_basic);

4
source4/torture/drs/drs_init.c
View File

@ -68,12 +68,12 @@ NTSTATUS torture_drs_init(void)
TALLOC_CTX *mem_ctx = talloc_autofree_context();
/* register RPC related test cases */
suite = torture_drs_rpc_suite(mem_ctx, "DRS-RPC");
suite = torture_drs_rpc_suite(mem_ctx, "drs.rpc");
if (!suite) return NT_STATUS_NO_MEMORY;
torture_register_suite(suite);
/* register DRS Unit test cases */
suite = torture_drs_unit_suite(mem_ctx, "DRS-UNIT");
suite = torture_drs_unit_suite(mem_ctx, "drs.unit");
if (!suite) return NT_STATUS_NO_MEMORY;
torture_register_suite(suite);

2
source4/torture/drs/rpc/dssync.c
View File

@ -1038,7 +1038,7 @@ void torture_drs_rpc_dssync_tcase(struct torture_suite *suite)
typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
struct torture_test *test;
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "DSSYNC");
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "dssync");
torture_tcase_set_fixture(tcase,
torture_dssync_tcase_setup,

2
source4/torture/drs/unit/prefixmap_tests.c
View File

@ -846,7 +846,7 @@ static bool torture_drs_unit_prefixmap_teardown(struct torture_context *tctx, st
/**
* Test case initialization for
* DRS-UNIT.prefixMap
* drs.unit.prefixMap
*/
struct torture_tcase * torture_drs_unit_prefixmap(struct torture_suite *suite)
{

2
source4/torture/drs/unit/schemainfo_tests.c
View File

@ -633,7 +633,7 @@ static bool torture_drs_unit_schemainfo_teardown(struct torture_context *tctx,
/**
* Test case initialization for
* DRS-UNIT.schemaInfo
* drs.unit.schemaInfo
*/
struct torture_tcase * torture_drs_unit_schemainfo(struct torture_suite *suite)
{

16
source4/torture/ldap/common.c
View File

@ -131,14 +131,14 @@ NTSTATUS torture_ldap_close(struct ldap_connection *conn)
NTSTATUS torture_ldap_init(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "LDAP");
torture_suite_add_simple_test(suite, "BENCH-CLDAP", torture_bench_cldap);
torture_suite_add_simple_test(suite, "BASIC", torture_ldap_basic);
torture_suite_add_simple_test(suite, "SORT", torture_ldap_sort);
torture_suite_add_simple_test(suite, "CLDAP", torture_cldap);
torture_suite_add_simple_test(suite, "SCHEMA", torture_ldap_schema);
torture_suite_add_simple_test(suite, "UPTODATEVECTOR", torture_ldap_uptodatevector);
torture_suite_add_simple_test(suite, "NESTED-SEARCH", test_ldap_nested_search);
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ldap");
torture_suite_add_simple_test(suite, "bench-cldap", torture_bench_cldap);
torture_suite_add_simple_test(suite, "basic", torture_ldap_basic);
torture_suite_add_simple_test(suite, "sort", torture_ldap_sort);
torture_suite_add_simple_test(suite, "cldap", torture_cldap);
torture_suite_add_simple_test(suite, "schema", torture_ldap_schema);
torture_suite_add_simple_test(suite, "uptodatevector", torture_ldap_uptodatevector);
torture_suite_add_simple_test(suite, "nested-search", test_ldap_nested_search);
suite->description = talloc_strdup(suite, "LDAP and CLDAP tests");

12
source4/torture/ldb/ldb.c
View File

@ -795,17 +795,17 @@ static bool torture_ldb_dn_invalid_extended(struct torture_context *torture)
struct torture_suite *torture_ldb(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "LDB");
struct torture_suite *suite = torture_suite_create(mem_ctx, "ldb");
if (suite == NULL) {
return NULL;
}
torture_suite_add_simple_test(suite, "ATTRS", torture_ldb_attrs);
torture_suite_add_simple_test(suite, "DN-ATTRS", torture_ldb_dn_attrs);
torture_suite_add_simple_test(suite, "DN-EXTENDED", torture_ldb_dn_extended);
torture_suite_add_simple_test(suite, "DN-INVALID-EXTENDED", torture_ldb_dn_invalid_extended);
torture_suite_add_simple_test(suite, "DN", torture_ldb_dn);
torture_suite_add_simple_test(suite, "attrs", torture_ldb_attrs);
torture_suite_add_simple_test(suite, "dn-attrs", torture_ldb_dn_attrs);
torture_suite_add_simple_test(suite, "dn-extended", torture_ldb_dn_extended);
torture_suite_add_simple_test(suite, "dn-invalid-extended", torture_ldb_dn_invalid_extended);
torture_suite_add_simple_test(suite, "dn", torture_ldb_dn);
suite->description = talloc_strdup(suite, "LDB (samba-specific behaviour) tests");

67
source4/torture/libnet/libnet.c
View File

@ -26,40 +26,41 @@
NTSTATUS torture_net_init(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NET");
struct torture_suite *suite = torture_suite_create(
talloc_autofree_context(), "net");
torture_suite_add_simple_test(suite, "USERINFO", torture_userinfo);
torture_suite_add_simple_test(suite, "USERADD", torture_useradd);
torture_suite_add_simple_test(suite, "USERDEL", torture_userdel);
torture_suite_add_simple_test(suite, "USERMOD", torture_usermod);
torture_suite_add_simple_test(suite, "DOMOPEN", torture_domainopen);
torture_suite_add_simple_test(suite, "GROUPINFO", torture_groupinfo);
torture_suite_add_simple_test(suite, "GROUPADD", torture_groupadd);
torture_suite_add_simple_test(suite, "API-LOOKUP", torture_lookup);
torture_suite_add_simple_test(suite, "API-LOOKUPHOST", torture_lookup_host);
torture_suite_add_simple_test(suite, "API-LOOKUPPDC", torture_lookup_pdc);
torture_suite_add_simple_test(suite, "API-LOOKUPNAME", torture_lookup_sam_name);
torture_suite_add_simple_test(suite, "API-CREATEUSER", torture_createuser);
torture_suite_add_simple_test(suite, "API-DELETEUSER", torture_deleteuser);
torture_suite_add_simple_test(suite, "API-MODIFYUSER", torture_modifyuser);
torture_suite_add_simple_test(suite, "API-USERINFO", torture_userinfo_api);
torture_suite_add_simple_test(suite, "API-USERLIST", torture_userlist);
torture_suite_add_simple_test(suite, "API-GROUPINFO", torture_groupinfo_api);
torture_suite_add_simple_test(suite, "API-GROUPLIST", torture_grouplist);
torture_suite_add_simple_test(suite, "API-CREATEGROUP", torture_creategroup);
torture_suite_add_simple_test(suite, "API-RPCCONN-BIND", torture_rpc_connect_binding);
torture_suite_add_simple_test(suite, "API-RPCCONN-SRV", torture_rpc_connect_srv);
torture_suite_add_simple_test(suite, "API-RPCCONN-PDC", torture_rpc_connect_pdc);
torture_suite_add_simple_test(suite, "API-RPCCONN-DC", torture_rpc_connect_dc);
torture_suite_add_simple_test(suite, "API-RPCCONN-DCINFO", torture_rpc_connect_dc_info);
torture_suite_add_simple_test(suite, "API-LISTSHARES", torture_listshares);
torture_suite_add_simple_test(suite, "API-DELSHARE", torture_delshare);
torture_suite_add_simple_test(suite, "API-DOMOPENLSA", torture_domain_open_lsa);
torture_suite_add_simple_test(suite, "API-DOMCLOSELSA", torture_domain_close_lsa);
torture_suite_add_simple_test(suite, "API-DOMOPENSAMR", torture_domain_open_samr);
torture_suite_add_simple_test(suite, "API-DOMCLOSESAMR", torture_domain_close_samr);
torture_suite_add_simple_test(suite, "API-BECOME-DC", torture_net_become_dc);
torture_suite_add_simple_test(suite, "API-DOMLIST", torture_domain_list);
torture_suite_add_simple_test(suite, "userinfo", torture_userinfo);
torture_suite_add_simple_test(suite, "useradd", torture_useradd);
torture_suite_add_simple_test(suite, "userdel", torture_userdel);
torture_suite_add_simple_test(suite, "usermod", torture_usermod);
torture_suite_add_simple_test(suite, "domopen", torture_domainopen);
torture_suite_add_simple_test(suite, "groupinfo", torture_groupinfo);
torture_suite_add_simple_test(suite, "groupadd", torture_groupadd);
torture_suite_add_simple_test(suite, "api.lookup", torture_lookup);
torture_suite_add_simple_test(suite, "api.lookuphost", torture_lookup_host);
torture_suite_add_simple_test(suite, "api.lookuppdc", torture_lookup_pdc);
torture_suite_add_simple_test(suite, "api.lookupname", torture_lookup_sam_name);
torture_suite_add_simple_test(suite, "api.createuser", torture_createuser);
torture_suite_add_simple_test(suite, "api.deleteuser", torture_deleteuser);
torture_suite_add_simple_test(suite, "api.modifyuser", torture_modifyuser);
torture_suite_add_simple_test(suite, "api.userinfo", torture_userinfo_api);
torture_suite_add_simple_test(suite, "api.userlist", torture_userlist);
torture_suite_add_simple_test(suite, "api.groupinfo", torture_groupinfo_api);
torture_suite_add_simple_test(suite, "api.grouplist", torture_grouplist);
torture_suite_add_simple_test(suite, "api.creategroup", torture_creategroup);
torture_suite_add_simple_test(suite, "api.rpcconn.bind", torture_rpc_connect_binding);
torture_suite_add_simple_test(suite, "api.rpcconn.srv", torture_rpc_connect_srv);
torture_suite_add_simple_test(suite, "api.rpcconn.pdc", torture_rpc_connect_pdc);
torture_suite_add_simple_test(suite, "api.rpcconn.dc", torture_rpc_connect_dc);
torture_suite_add_simple_test(suite, "api.rpcconn.dcinfo", torture_rpc_connect_dc_info);
torture_suite_add_simple_test(suite, "api.listshares", torture_listshares);
torture_suite_add_simple_test(suite, "api.delshare", torture_delshare);
torture_suite_add_simple_test(suite, "api.domopenlsa", torture_domain_open_lsa);
torture_suite_add_simple_test(suite, "api.domcloselsa", torture_domain_close_lsa);
torture_suite_add_simple_test(suite, "api.domopensamr", torture_domain_open_samr);
torture_suite_add_simple_test(suite, "api.domclosesamr", torture_domain_close_samr);
torture_suite_add_simple_test(suite, "api.become.dc", torture_net_become_dc);
torture_suite_add_simple_test(suite, "api.domlist", torture_domain_list);
suite->description = talloc_strdup(suite, "libnet convenience interface tests");

10
source4/torture/libnetapi/libnetapi.c
View File

@ -66,12 +66,12 @@ NTSTATUS torture_libnetapi_init(void)
{
struct torture_suite *suite;
suite = torture_suite_create(talloc_autofree_context(), "NETAPI");
suite = torture_suite_create(talloc_autofree_context(), "netapi");
torture_suite_add_simple_test(suite, "SERVER", torture_libnetapi_server);
torture_suite_add_simple_test(suite, "GROUP", torture_libnetapi_group);
torture_suite_add_simple_test(suite, "USER", torture_libnetapi_user);
torture_suite_add_simple_test(suite, "INITIALIZE", torture_libnetapi_initialize);
torture_suite_add_simple_test(suite, "server", torture_libnetapi_server);
torture_suite_add_simple_test(suite, "group", torture_libnetapi_group);
torture_suite_add_simple_test(suite, "user", torture_libnetapi_user);
torture_suite_add_simple_test(suite, "initialize", torture_libnetapi_initialize);
suite->description = talloc_strdup(suite, "libnetapi convenience interface tests");

12
source4/torture/libsmbclient/libsmbclient.c
View File

@ -205,13 +205,13 @@ NTSTATUS torture_libsmbclient_init(void)
{
struct torture_suite *suite;
suite = torture_suite_create(talloc_autofree_context(), "LIBSMBCLIENT");
suite = torture_suite_create(talloc_autofree_context(), "libsmbclient");
torture_suite_add_simple_test(suite, "VERSION", torture_libsmbclient_version);
torture_suite_add_simple_test(suite, "INITIALIZE", torture_libsmbclient_initialize);
torture_suite_add_simple_test(suite, "CONFIGURATION", torture_libsmbclient_configuration);
torture_suite_add_simple_test(suite, "OPTIONS", torture_libsmbclient_options);
torture_suite_add_simple_test(suite, "OPENDIR", torture_libsmbclient_opendir);
torture_suite_add_simple_test(suite, "version", torture_libsmbclient_version);
torture_suite_add_simple_test(suite, "initialize", torture_libsmbclient_initialize);
torture_suite_add_simple_test(suite, "configuration", torture_libsmbclient_configuration);
torture_suite_add_simple_test(suite, "options", torture_libsmbclient_options);
torture_suite_add_simple_test(suite, "opendir", torture_libsmbclient_opendir);
suite->description = talloc_strdup(suite, "libsmbclient interface tests");

2
source4/torture/local/dbspeed.c
View File

@ -257,7 +257,7 @@ failed:
struct torture_suite *torture_local_dbspeed(TALLOC_CTX *mem_ctx)
{
struct torture_suite *s = torture_suite_create(mem_ctx, "DBSPEED");
struct torture_suite *s = torture_suite_create(mem_ctx, "dbspeed");
torture_suite_add_simple_tcase_const(s, "tdb_speed", test_tdb_speed,
NULL);
torture_suite_add_simple_tcase_const(s, "ldb_speed", test_ldb_speed,

13
source4/torture/local/local.c
View File

@ -75,17 +75,16 @@ NTSTATUS torture_local_init(void)
{
int i;
struct torture_suite *suite = torture_suite_create(
talloc_autofree_context(),
"LOCAL");
talloc_autofree_context(), "local");
torture_suite_add_simple_test(suite, "TALLOC", torture_local_talloc);
torture_suite_add_simple_test(suite, "REPLACE", torture_local_replace);
torture_suite_add_simple_test(suite, "talloc", torture_local_talloc);
torture_suite_add_simple_test(suite, "replace", torture_local_replace);
torture_suite_add_simple_test(suite,
"CRYPTO-MD4", torture_local_crypto_md4);
torture_suite_add_simple_test(suite, "CRYPTO-MD5",
"crypto.md4", torture_local_crypto_md4);
torture_suite_add_simple_test(suite, "crypto.md5",
torture_local_crypto_md5);
torture_suite_add_simple_test(suite, "CRYPTO-HMACMD5",
torture_suite_add_simple_test(suite, "crypto.hmacmd5",
torture_local_crypto_hmacmd5);
for (i = 0; suite_generators[i]; i++)

3
source4/torture/local/torture.c
View File

@ -74,8 +74,7 @@ static bool test_provision(struct torture_context *tctx)
struct torture_suite *torture_local_torture(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
"TORTURE");
struct torture_suite *suite = torture_suite_create(mem_ctx, "torture");
torture_suite_add_simple_test(suite, "tempdir", test_tempdir);
torture_suite_add_simple_test(suite, "provision", test_provision);

8
source4/torture/nbench/nbench.c
View File

@ -282,12 +282,10 @@ bool torture_nbench(struct torture_context *torture)
NTSTATUS torture_nbench_init(void)
{
struct torture_suite *suite =
torture_suite_create(
talloc_autofree_context(),
"BENCH");
struct torture_suite *suite = torture_suite_create(
talloc_autofree_context(), "bench");
torture_suite_add_simple_test(suite, "NBENCH", torture_nbench);
torture_suite_add_simple_test(suite, "nbench", torture_nbench);
suite->description = talloc_strdup(suite, "Benchmarks");

2
source4/torture/nbt/dgram.c
View File

@ -655,7 +655,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
*/
struct torture_suite *torture_nbt_dgram(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "DGRAM");
struct torture_suite *suite = torture_suite_create(mem_ctx, "dgram");
torture_suite_add_simple_test(suite, "netlogon", nbt_test_netlogon);
torture_suite_add_simple_test(suite, "netlogon2", nbt_test_netlogon2);

2
source4/torture/nbt/nbt.c
View File

@ -49,7 +49,7 @@ bool torture_nbt_get_name(struct torture_context *tctx,
NTSTATUS torture_nbt_init(void)
{
struct torture_suite *suite = torture_suite_create(
talloc_autofree_context(), "NBT");
talloc_autofree_context(), "nbt");
/* nbt tests */
torture_suite_add_suite(suite, torture_nbt_register(suite));
torture_suite_add_suite(suite, torture_nbt_wins(suite));

2
source4/torture/nbt/query.c
View File

@ -108,7 +108,7 @@ static bool bench_namequery(struct torture_context *tctx)
*/
struct torture_suite *torture_bench_nbt(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "BENCH");
struct torture_suite *suite = torture_suite_create(mem_ctx, "bench");
torture_suite_add_simple_test(suite, "namequery", bench_namequery);
return suite;

2
source4/torture/nbt/register.c
View File

@ -168,7 +168,7 @@ struct torture_suite *torture_nbt_register(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite;
suite = torture_suite_create(mem_ctx, "REGISTER");
suite = torture_suite_create(mem_ctx, "register");
torture_suite_add_simple_test(suite, "register_own", nbt_register_own);
torture_suite_add_simple_test(suite, "refresh_own", nbt_refresh_own);

2
source4/torture/nbt/wins.c
View File

@ -533,7 +533,7 @@ static bool nbt_test_wins(struct torture_context *tctx)
*/
struct torture_suite *torture_nbt_wins(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "WINS");
struct torture_suite *suite = torture_suite_create(mem_ctx, "wins");
torture_suite_add_simple_test(suite, "wins", nbt_test_wins);

3
source4/torture/nbt/winsbench.c
View File

@ -292,8 +292,7 @@ static bool bench_wins(struct torture_context *tctx)
*/
struct torture_suite *torture_bench_wins(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
"BENCH-WINS");
struct torture_suite *suite = torture_suite_create(mem_ctx, "bench-wins");
torture_suite_add_simple_test(suite, "wins", bench_wins);

5
source4/torture/nbt/winsreplication.c
View File

@ -9739,15 +9739,14 @@ static bool torture_nbt_winsreplication_owned(struct torture_context *tctx)
struct torture_suite *torture_nbt_winsreplication(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(
mem_ctx, "WINSREPLICATION");
mem_ctx, "winsreplication");
struct torture_tcase *tcase;
tcase = torture_suite_add_simple_test(suite, "assoc_ctx1",
test_assoc_ctx1);
tcase->tests->dangerous = true;
torture_suite_add_simple_test(suite, "assoc_ctx2",
test_assoc_ctx2);
torture_suite_add_simple_test(suite, "assoc_ctx2", test_assoc_ctx2);
torture_suite_add_simple_test(suite, "wins_replication",
test_wins_replication);

2
source4/torture/ndr/ndr.c
View File

@ -339,7 +339,7 @@ static bool test_compare_uuid(struct torture_context *tctx)
struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "NDR");
struct torture_suite *suite = torture_suite_create(mem_ctx, "ndr");
torture_suite_add_suite(suite, ndr_winreg_suite(suite));
torture_suite_add_suite(suite, ndr_atsvc_suite(suite));

6
source4/torture/ntp/ntp_signd.c
View File

@ -284,11 +284,11 @@ static bool test_ntp_signd(struct torture_context *tctx,
NTSTATUS torture_ntp_init(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NTP");
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ntp");
struct torture_rpc_tcase *tcase;
tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "SIGND",
&ndr_table_netlogon, TEST_MACHINE_NAME);
tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite,
"signd", &ndr_table_netlogon, TEST_MACHINE_NAME);
torture_rpc_tcase_add_test_creds(tcase, "ntp_signd", test_ntp_signd);

2
source4/torture/rap/printing.c
View File

@ -686,7 +686,7 @@ static bool test_rap_print(struct torture_context *tctx,
struct torture_suite *torture_rap_printing(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "PRINTING");
struct torture_suite *suite = torture_suite_create(mem_ctx, "printing");
torture_suite_add_1smb_test(suite, "raw_print", test_raw_print);
torture_suite_add_1smb_test(suite, "rap_print", test_rap_print);

6
source4/torture/rap/rap.c
View File

@ -1550,8 +1550,8 @@ bool torture_rap_scan(struct torture_context *torture, struct smbcli_state *cli)
NTSTATUS torture_rap_init(void)
{
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "RAP");
struct torture_suite *suite_basic = torture_suite_create(suite, "BASIC");
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "rap");
struct torture_suite *suite_basic = torture_suite_create(suite, "basic");
torture_suite_add_suite(suite, suite_basic);
torture_suite_add_suite(suite, torture_rap_rpc(suite));
@ -1565,7 +1565,7 @@ NTSTATUS torture_rap_init(void)
torture_suite_add_1smb_test(suite_basic, "netservergetinfo",
test_netservergetinfo);
torture_suite_add_1smb_test(suite, "SCAN", torture_rap_scan);
torture_suite_add_1smb_test(suite, "scan", torture_rap_scan);
suite->description = talloc_strdup(suite,
"Remote Administration Protocol tests");

2
source4/torture/rap/rpc.c
View File

@ -88,7 +88,7 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
struct torture_suite *torture_rap_rpc(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "RPC");
struct torture_suite *suite = torture_suite_create(mem_ctx, "rpc");
torture_suite_add_1smb_test(suite, "netservergetinfo",
test_rpc_netservergetinfo);

2
source4/torture/rap/sam.c
View File

@ -238,7 +238,7 @@ static bool test_usergetinfo(struct torture_context *tctx,
struct torture_suite *torture_rap_sam(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "SAM");
struct torture_suite *suite = torture_suite_create(mem_ctx, "sam");
torture_suite_add_1smb_test(suite, "userpasswordset2", test_userpasswordset2);
torture_suite_add_1smb_test(suite, "oemchangepassword", test_oemchangepassword);

20
source4/torture/raw/acls.c
View File

@ -2438,19 +2438,19 @@ done:
*/
struct torture_suite *torture_raw_acls(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "ACLS");
struct torture_suite *suite = torture_suite_create(mem_ctx, "acls");
torture_suite_add_1smb_test(suite, "SD", test_sd);
torture_suite_add_1smb_test(suite, "CREATE_FILE", test_nttrans_create_file);
torture_suite_add_1smb_test(suite, "CREATE_DIR", test_nttrans_create_dir);
torture_suite_add_1smb_test(suite, "NULLDACL", test_nttrans_create_null_dacl);
torture_suite_add_1smb_test(suite, "CREATOR", test_creator_sid);
torture_suite_add_1smb_test(suite, "GENERIC", test_generic_bits);
torture_suite_add_1smb_test(suite, "OWNER", test_owner_bits);
torture_suite_add_1smb_test(suite, "INHERITANCE", test_inheritance);
torture_suite_add_1smb_test(suite, "sd", test_sd);
torture_suite_add_1smb_test(suite, "create_file", test_nttrans_create_file);
torture_suite_add_1smb_test(suite, "create_dir", test_nttrans_create_dir);
torture_suite_add_1smb_test(suite, "nulldacl", test_nttrans_create_null_dacl);
torture_suite_add_1smb_test(suite, "creator", test_creator_sid);
torture_suite_add_1smb_test(suite, "generic", test_generic_bits);
torture_suite_add_1smb_test(suite, "owner", test_owner_bits);
torture_suite_add_1smb_test(suite, "inheritance", test_inheritance);
/* torture_suite_add_1smb_test(suite, "INHERITFLAGS", test_inheritance_flags); */
torture_suite_add_1smb_test(suite, "DYNAMIC", test_inheritance_dynamic);
torture_suite_add_1smb_test(suite, "dynamic", test_inheritance_dynamic);
/* XXX This test does not work against XP or Vista.
torture_suite_add_1smb_test(suite, "GETSET", test_sd_get_set);
*/

8
source4/torture/raw/lock.c
View File

@ -2273,7 +2273,7 @@ done:
*/
struct torture_suite *torture_raw_lock(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCK");
struct torture_suite *suite = torture_suite_create(mem_ctx, "lock");
torture_suite_add_1smb_test(suite, "lockx", test_lockx);
torture_suite_add_1smb_test(suite, "lock", test_lock);
@ -2286,10 +2286,8 @@ struct torture_suite *torture_raw_lock(TALLOC_CTX *mem_ctx)
torture_suite_add_1smb_test(suite, "unlock", test_unlock);
torture_suite_add_1smb_test(suite, "multiple_unlock",
test_multiple_unlock);
torture_suite_add_1smb_test(suite, "zerobytelocks",
test_zerobytelocks);
torture_suite_add_1smb_test(suite, "zerobyteread",
test_zerobyteread);
torture_suite_add_1smb_test(suite, "zerobytelocks", test_zerobytelocks);
torture_suite_add_1smb_test(suite, "zerobyteread", test_zerobyteread);
return suite;
}

36
source4/torture/raw/open.c
View File

@ -2069,25 +2069,25 @@ static bool test_ntcreatexdir(struct torture_context *tctx,
*/
struct torture_suite *torture_raw_open(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "OPEN");
struct torture_suite *suite = torture_suite_create(mem_ctx, "open");
torture_suite_add_1smb_test(suite, "BRLOCKED", test_ntcreatex_brlocked);
torture_suite_add_1smb_test(suite, "OPEN", test_open);
torture_suite_add_1smb_test(suite, "OPEN-MULTI", test_raw_open_multi);
torture_suite_add_1smb_test(suite, "OPENX", test_openx);
torture_suite_add_1smb_test(suite, "NTCREATEX", test_ntcreatex);
torture_suite_add_1smb_test(suite, "NTTRANS-CREATE", test_nttrans_create);
torture_suite_add_1smb_test(suite, "T2OPEN", test_t2open);
torture_suite_add_1smb_test(suite, "MKNEW", test_mknew);
torture_suite_add_1smb_test(suite, "CREATE", test_create);
torture_suite_add_1smb_test(suite, "CTEMP", test_ctemp);
torture_suite_add_1smb_test(suite, "CHAINED-OPENX", test_chained);
torture_suite_add_1smb_test(suite, "CHAINED-NTCREATEX", test_chained_ntcreatex_readx);
torture_suite_add_1smb_test(suite, "NO-LEADING-SLASH", test_no_leading_slash);
torture_suite_add_1smb_test(suite, "OPENX-OVER-DIR", test_openx_over_dir);
torture_suite_add_1smb_test(suite, "OPEN-FOR-DELETE", test_open_for_delete);
torture_suite_add_1smb_test(suite, "OPENDISP-DIR", test_ntcreatex_opendisp_dir);
torture_suite_add_1smb_test(suite, "NTCREATEDIR", test_ntcreatexdir);
torture_suite_add_1smb_test(suite, "brlocked", test_ntcreatex_brlocked);
torture_suite_add_1smb_test(suite, "open", test_open);
torture_suite_add_1smb_test(suite, "open-multi", test_raw_open_multi);
torture_suite_add_1smb_test(suite, "openx", test_openx);
torture_suite_add_1smb_test(suite, "ntcreatex", test_ntcreatex);
torture_suite_add_1smb_test(suite, "nttrans-create", test_nttrans_create);
torture_suite_add_1smb_test(suite, "t2open", test_t2open);
torture_suite_add_1smb_test(suite, "mknew", test_mknew);
torture_suite_add_1smb_test(suite, "create", test_create);
torture_suite_add_1smb_test(suite, "ctemp", test_ctemp);
torture_suite_add_1smb_test(suite, "chained-openx", test_chained);
torture_suite_add_1smb_test(suite, "chained-ntcreatex", test_chained_ntcreatex_readx);
torture_suite_add_1smb_test(suite, "no-leading-slash", test_no_leading_slash);
torture_suite_add_1smb_test(suite, "openx-over-dir", test_openx_over_dir);
torture_suite_add_1smb_test(suite, "open-for-delete", test_open_for_delete);
torture_suite_add_1smb_test(suite, "opendisp-dir", test_ntcreatex_opendisp_dir);
torture_suite_add_1smb_test(suite, "ntcreatedir", test_ntcreatexdir);
return suite;
}

78
source4/torture/raw/oplock.c
View File

@ -3860,46 +3860,46 @@ done:
*/
struct torture_suite *torture_raw_oplock(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "OPLOCK");
struct torture_suite *suite = torture_suite_create(mem_ctx, "oplock");
torture_suite_add_2smb_test(suite, "EXCLUSIVE1", test_raw_oplock_exclusive1);
torture_suite_add_2smb_test(suite, "EXCLUSIVE2", test_raw_oplock_exclusive2);
torture_suite_add_2smb_test(suite, "EXCLUSIVE3", test_raw_oplock_exclusive3);
torture_suite_add_2smb_test(suite, "EXCLUSIVE4", test_raw_oplock_exclusive4);
torture_suite_add_2smb_test(suite, "EXCLUSIVE5", test_raw_oplock_exclusive5);
torture_suite_add_2smb_test(suite, "EXCLUSIVE6", test_raw_oplock_exclusive6);
torture_suite_add_2smb_test(suite, "EXCLUSIVE7", test_raw_oplock_exclusive7);
torture_suite_add_2smb_test(suite, "BATCH1", test_raw_oplock_batch1);
torture_suite_add_2smb_test(suite, "BATCH2", test_raw_oplock_batch2);
torture_suite_add_2smb_test(suite, "BATCH3", test_raw_oplock_batch3);
torture_suite_add_2smb_test(suite, "BATCH4", test_raw_oplock_batch4);
torture_suite_add_2smb_test(suite, "BATCH5", test_raw_oplock_batch5);
torture_suite_add_2smb_test(suite, "BATCH6", test_raw_oplock_batch6);
torture_suite_add_2smb_test(suite, "BATCH7", test_raw_oplock_batch7);
torture_suite_add_2smb_test(suite, "BATCH8", test_raw_oplock_batch8);
torture_suite_add_2smb_test(suite, "BATCH9", test_raw_oplock_batch9);
torture_suite_add_2smb_test(suite, "BATCH10", test_raw_oplock_batch10);
torture_suite_add_2smb_test(suite, "BATCH11", test_raw_oplock_batch11);
torture_suite_add_2smb_test(suite, "BATCH12", test_raw_oplock_batch12);
torture_suite_add_2smb_test(suite, "BATCH13", test_raw_oplock_batch13);
torture_suite_add_2smb_test(suite, "BATCH14", test_raw_oplock_batch14);
torture_suite_add_2smb_test(suite, "BATCH15", test_raw_oplock_batch15);
torture_suite_add_2smb_test(suite, "BATCH16", test_raw_oplock_batch16);
torture_suite_add_2smb_test(suite, "BATCH17", test_raw_oplock_batch17);
torture_suite_add_2smb_test(suite, "BATCH18", test_raw_oplock_batch18);
torture_suite_add_2smb_test(suite, "BATCH19", test_raw_oplock_batch19);
torture_suite_add_2smb_test(suite, "BATCH20", test_raw_oplock_batch20);
torture_suite_add_2smb_test(suite, "BATCH21", test_raw_oplock_batch21);
torture_suite_add_2smb_test(suite, "BATCH22", test_raw_oplock_batch22);
torture_suite_add_2smb_test(suite, "BATCH23", test_raw_oplock_batch23);
torture_suite_add_2smb_test(suite, "BATCH24", test_raw_oplock_batch24);
torture_suite_add_2smb_test(suite, "BATCH25", test_raw_oplock_batch25);
torture_suite_add_2smb_test(suite, "BATCH26", test_raw_oplock_batch26);
torture_suite_add_2smb_test(suite, "STREAM1", test_raw_oplock_stream1);
torture_suite_add_1smb_test(suite, "DOC1", test_raw_oplock_doc);
torture_suite_add_2smb_test(suite, "BRL1", test_raw_oplock_brl1);
torture_suite_add_1smb_test(suite, "BRL2", test_raw_oplock_brl2);
torture_suite_add_1smb_test(suite, "BRL3", test_raw_oplock_brl3);
torture_suite_add_2smb_test(suite, "exclusive1", test_raw_oplock_exclusive1);
torture_suite_add_2smb_test(suite, "exclusive2", test_raw_oplock_exclusive2);
torture_suite_add_2smb_test(suite, "exclusive3", test_raw_oplock_exclusive3);
torture_suite_add_2smb_test(suite, "exclusive4", test_raw_oplock_exclusive4);
torture_suite_add_2smb_test(suite, "exclusive5", test_raw_oplock_exclusive5);
torture_suite_add_2smb_test(suite, "exclusive6", test_raw_oplock_exclusive6);
torture_suite_add_2smb_test(suite, "exclusive7", test_raw_oplock_exclusive7);
torture_suite_add_2smb_test(suite, "batch1", test_raw_oplock_batch1);
torture_suite_add_2smb_test(suite, "batch2", test_raw_oplock_batch2);
torture_suite_add_2smb_test(suite, "batch3", test_raw_oplock_batch3);
torture_suite_add_2smb_test(suite, "batch4", test_raw_oplock_batch4);
torture_suite_add_2smb_test(suite, "batch5", test_raw_oplock_batch5);
torture_suite_add_2smb_test(suite, "batch6", test_raw_oplock_batch6);
torture_suite_add_2smb_test(suite, "batch7", test_raw_oplock_batch7);
torture_suite_add_2smb_test(suite, "batch8", test_raw_oplock_batch8);
torture_suite_add_2smb_test(suite, "batch9", test_raw_oplock_batch9);
torture_suite_add_2smb_test(suite, "batch10", test_raw_oplock_batch10);
torture_suite_add_2smb_test(suite, "batch11", test_raw_oplock_batch11);
torture_suite_add_2smb_test(suite, "batch12", test_raw_oplock_batch12);
torture_suite_add_2smb_test(suite, "batch13", test_raw_oplock_batch13);
torture_suite_add_2smb_test(suite, "batch14", test_raw_oplock_batch14);
torture_suite_add_2smb_test(suite, "batch15", test_raw_oplock_batch15);
torture_suite_add_2smb_test(suite, "batch16", test_raw_oplock_batch16);
torture_suite_add_2smb_test(suite, "batch17", test_raw_oplock_batch17);
torture_suite_add_2smb_test(suite, "batch18", test_raw_oplock_batch18);
torture_suite_add_2smb_test(suite, "batch19", test_raw_oplock_batch19);
torture_suite_add_2smb_test(suite, "batch20", test_raw_oplock_batch20);
torture_suite_add_2smb_test(suite, "batch21", test_raw_oplock_batch21);
torture_suite_add_2smb_test(suite, "batch22", test_raw_oplock_batch22);
torture_suite_add_2smb_test(suite, "batch23", test_raw_oplock_batch23);
torture_suite_add_2smb_test(suite, "batch24", test_raw_oplock_batch24);
torture_suite_add_2smb_test(suite, "batch25", test_raw_oplock_batch25);
torture_suite_add_2smb_test(suite, "batch26", test_raw_oplock_batch26);
torture_suite_add_2smb_test(suite, "stream1", test_raw_oplock_stream1);
torture_suite_add_1smb_test(suite, "doc1", test_raw_oplock_doc);
torture_suite_add_2smb_test(suite, "brl1", test_raw_oplock_brl1);
torture_suite_add_1smb_test(suite, "brl2", test_raw_oplock_brl2);
torture_suite_add_1smb_test(suite, "brl3", test_raw_oplock_brl3);
return suite;
}

63
source4/torture/raw/raw.c
View File

@ -26,55 +26,54 @@
NTSTATUS torture_raw_init(void)
{
struct torture_suite *suite = torture_suite_create(
talloc_autofree_context(),
"RAW");
talloc_autofree_context(), "raw");
/* RAW smb tests */
torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock);
torture_suite_add_simple_test(suite, "PING-PONG", torture_ping_pong);
torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock);
torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open);
torture_suite_add_simple_test(suite, "BENCH-LOOKUP",
torture_suite_add_simple_test(suite, "bench-oplock", torture_bench_oplock);
torture_suite_add_simple_test(suite, "ping-pong", torture_ping_pong);
torture_suite_add_simple_test(suite, "bench-lock", torture_bench_lock);
torture_suite_add_simple_test(suite, "bench-open", torture_bench_open);
torture_suite_add_simple_test(suite, "bench-lookup",
torture_bench_lookup);
torture_suite_add_simple_test(suite, "BENCH-TCON",
torture_suite_add_simple_test(suite, "bench-tcon",
torture_bench_treeconnect);
torture_suite_add_simple_test(suite, "OFFLINE", torture_test_offline);
torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo);
torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo);
torture_suite_add_1smb_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe);
torture_suite_add_simple_test(suite, "offline", torture_test_offline);
torture_suite_add_1smb_test(suite, "qfsinfo", torture_raw_qfsinfo);
torture_suite_add_1smb_test(suite, "qfileinfo", torture_raw_qfileinfo);
torture_suite_add_1smb_test(suite, "qfileinfo.ipc", torture_raw_qfileinfo_pipe);
torture_suite_add_suite(suite, torture_raw_sfileinfo(suite));
torture_suite_add_suite(suite, torture_raw_search(suite));
torture_suite_add_1smb_test(suite, "CLOSE", torture_raw_close);
torture_suite_add_1smb_test(suite, "close", torture_raw_close);
torture_suite_add_suite(suite, torture_raw_open(suite));
torture_suite_add_1smb_test(suite, "MKDIR", torture_raw_mkdir);
torture_suite_add_1smb_test(suite, "mkdir", torture_raw_mkdir);
torture_suite_add_suite(suite, torture_raw_oplock(suite));
torture_suite_add_1smb_test(suite, "HOLD-OPLOCK", torture_hold_oplock);
torture_suite_add_2smb_test(suite, "NOTIFY", torture_raw_notify);
torture_suite_add_1smb_test(suite, "MUX", torture_raw_mux);
torture_suite_add_1smb_test(suite, "IOCTL", torture_raw_ioctl);
torture_suite_add_1smb_test(suite, "CHKPATH", torture_raw_chkpath);
torture_suite_add_1smb_test(suite, "hold-oplock", torture_hold_oplock);
torture_suite_add_2smb_test(suite, "notify", torture_raw_notify);
torture_suite_add_1smb_test(suite, "mux", torture_raw_mux);
torture_suite_add_1smb_test(suite, "ioctl", torture_raw_ioctl);
torture_suite_add_1smb_test(suite, "chkpath", torture_raw_chkpath);
torture_suite_add_suite(suite, torture_raw_unlink(suite));
torture_suite_add_suite(suite, torture_raw_read(suite));
torture_suite_add_suite(suite, torture_raw_write(suite));
torture_suite_add_suite(suite, torture_raw_lock(suite));
torture_suite_add_1smb_test(suite, "CONTEXT", torture_raw_context);
torture_suite_add_1smb_test(suite, "context", torture_raw_context);
torture_suite_add_suite(suite, torture_raw_rename(suite));
torture_suite_add_1smb_test(suite, "SEEK", torture_raw_seek);
torture_suite_add_1smb_test(suite, "EAS", torture_raw_eas);
torture_suite_add_1smb_test(suite, "seek", torture_raw_seek);
torture_suite_add_1smb_test(suite, "eas", torture_raw_eas);
torture_suite_add_suite(suite, torture_raw_streams(suite));
torture_suite_add_suite(suite, torture_raw_acls(suite));
torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite);
torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide);
torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr);
torture_suite_add_simple_test(suite, "SAMBA3ROOTDIRFID",
torture_suite_add_1smb_test(suite, "composite", torture_raw_composite);
torture_suite_add_simple_test(suite, "samba3hide", torture_samba3_hide);
torture_suite_add_simple_test(suite, "samba3closeerr", torture_samba3_closeerr);
torture_suite_add_simple_test(suite, "samba3rootdirfid",
torture_samba3_rootdirfid);
torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp);
torture_suite_add_simple_test(suite, "SAMBA3OPLOCKLOGOFF", torture_samba3_oplock_logoff);
torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath);
torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE",
torture_suite_add_simple_test(suite, "samba3checkfsp", torture_samba3_checkfsp);
torture_suite_add_simple_test(suite, "samba3oplocklogoff", torture_samba3_oplock_logoff);
torture_suite_add_simple_test(suite, "samba3badpath", torture_samba3_badpath);
torture_suite_add_simple_test(suite, "samba3caseinsensitive",
torture_samba3_caseinsensitive);
torture_suite_add_simple_test(suite, "SAMBA3POSIXTIMEDLOCK",
torture_suite_add_simple_test(suite, "samba3posixtimedlock",
torture_samba3_posixtimedlock);
torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas);
torture_suite_add_simple_test(suite, "scan-eamax", torture_max_eas);
suite->description = talloc_strdup(suite, "Tests for the raw SMB interface");

4
source4/torture/raw/read.c
View File

@ -980,14 +980,14 @@ done:
*/
struct torture_suite *torture_raw_read(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "READ");
struct torture_suite *suite = torture_suite_create(mem_ctx, "read");
torture_suite_add_1smb_test(suite, "read", test_read);
torture_suite_add_1smb_test(suite, "readx", test_readx);
torture_suite_add_1smb_test(suite, "lockread", test_lockread);
torture_suite_add_1smb_test(suite, "readbraw", test_readbraw);
torture_suite_add_1smb_test(suite, "read for execute",
test_read_for_execute);
test_read_for_execute);
return suite;
}

2
source4/torture/raw/rename.c
View File

@ -717,7 +717,7 @@ extern bool test_nttransrename(struct torture_context *tctx, struct smbcli_state
*/
struct torture_suite *torture_raw_rename(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "RENAME");
struct torture_suite *suite = torture_suite_create(mem_ctx, "rename");
torture_suite_add_1smb_test(suite, "mv", test_mv);
/* test_trans2rename and test_nttransrename are actually in torture/raw/oplock.c to

2
source4/torture/raw/search.c
View File

@ -1510,7 +1510,7 @@ done:
*/
struct torture_suite *torture_raw_search(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "SEARCH");
struct torture_suite *suite = torture_suite_create(mem_ctx, "search");
torture_suite_add_1smb_test(suite, "one file search", test_one_file);
torture_suite_add_1smb_test(suite, "many files", test_many_files);

17
source4/torture/raw/setfileinfo.c
View File

@ -1143,18 +1143,17 @@ done:
struct torture_suite *torture_raw_sfileinfo(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
"SFILEINFO");
struct torture_suite *suite = torture_suite_create(mem_ctx, "sfileinfo");
torture_suite_add_1smb_test(suite, "BASE", torture_raw_sfileinfo_base);
torture_suite_add_1smb_test(suite, "RENAME",
torture_raw_sfileinfo_rename);
torture_suite_add_1smb_test(suite, "BUG", torture_raw_sfileinfo_bug);
torture_suite_add_2smb_test(suite, "END-OF-FILE",
torture_suite_add_1smb_test(suite, "base", torture_raw_sfileinfo_base);
torture_suite_add_1smb_test(suite, "rename", torture_raw_sfileinfo_rename);
torture_suite_add_1smb_test(suite, "bug", torture_raw_sfileinfo_bug);
torture_suite_add_2smb_test(suite, "end-of-file",
torture_raw_sfileinfo_eof);
torture_suite_add_2smb_test(suite, "END-OF-FILE-ACCESS",
torture_suite_add_2smb_test(suite, "end-of-file-access",
torture_raw_sfileinfo_eof_access);
torture_suite_add_1smb_test(suite, "ARCHIVE", torture_raw_sfileinfo_archive);
torture_suite_add_1smb_test(suite, "archive",
torture_raw_sfileinfo_archive);
return suite;
}

27
source4/torture/raw/streams.c
View File

@ -1896,22 +1896,21 @@ static bool test_stream_summary_tab(struct torture_context *tctx,
*/
struct torture_suite *torture_raw_streams(TALLOC_CTX *tctx)
{
struct torture_suite *suite = torture_suite_create(tctx, "STREAMS");
struct torture_suite *suite = torture_suite_create(tctx, "streams");
torture_suite_add_1smb_test(suite, "DIR", test_stream_dir);
torture_suite_add_1smb_test(suite, "IO", test_stream_io);
torture_suite_add_1smb_test(suite, "SHAREMODES",
test_stream_sharemodes);
torture_suite_add_1smb_test(suite, "DELETE", test_stream_delete);
torture_suite_add_1smb_test(suite, "NAMES", test_stream_names);
torture_suite_add_1smb_test(suite, "NAMES2", test_stream_names2);
torture_suite_add_1smb_test(suite, "RENAME", test_stream_rename);
torture_suite_add_1smb_test(suite, "RENAME2", test_stream_rename2);
torture_suite_add_1smb_test(suite, "RENAME3", test_stream_rename3);
torture_suite_add_1smb_test(suite, "CREATEDISP",
torture_suite_add_1smb_test(suite, "dir", test_stream_dir);
torture_suite_add_1smb_test(suite, "io", test_stream_io);
torture_suite_add_1smb_test(suite, "sharemodes", test_stream_sharemodes);
torture_suite_add_1smb_test(suite, "delete", test_stream_delete);
torture_suite_add_1smb_test(suite, "names", test_stream_names);
torture_suite_add_1smb_test(suite, "names2", test_stream_names2);
torture_suite_add_1smb_test(suite, "rename", test_stream_rename);
torture_suite_add_1smb_test(suite, "rename2", test_stream_rename2);
torture_suite_add_1smb_test(suite, "rename3", test_stream_rename3);
torture_suite_add_1smb_test(suite, "createdisp",
test_stream_create_disposition);
torture_suite_add_1smb_test(suite, "ATTR", test_stream_attributes);
torture_suite_add_1smb_test(suite, "SUMTAB", test_stream_summary_tab);
torture_suite_add_1smb_test(suite, "attr", test_stream_attributes);
torture_suite_add_1smb_test(suite, "sumtab", test_stream_summary_tab);
/* torture_suite_add_1smb_test(suite, "LARGESTREAMINFO", */
/* test_stream_large_streaminfo); */

4
source4/torture/raw/unlink.c
View File

@ -538,11 +538,11 @@ done:
*/
struct torture_suite *torture_raw_unlink(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "UNLINK");
struct torture_suite *suite = torture_suite_create(mem_ctx, "unlink");
torture_suite_add_1smb_test(suite, "unlink", test_unlink);
torture_suite_add_1smb_test(suite, "delete_on_close", test_delete_on_close);
torture_suite_add_2smb_test(suite, "UNLINK-DEFER", test_unlink_defer);
torture_suite_add_2smb_test(suite, "unlink-defer", test_unlink_defer);
return suite;
}

2
source4/torture/raw/write.c
View File

@ -726,7 +726,7 @@ done:
*/
struct torture_suite *torture_raw_write(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "WRITE");
struct torture_suite *suite = torture_suite_create(mem_ctx, "write");
torture_suite_add_1smb_test(suite, "write", test_write);
torture_suite_add_1smb_test(suite, "write unlock", test_writeunlock);

2
source4/torture/rpc/atsvc.c
View File

@ -126,7 +126,7 @@ static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
struct torture_suite *torture_rpc_atsvc(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "ATSVC");
struct torture_suite *suite = torture_suite_create(mem_ctx, "atsvc");
struct torture_rpc_tcase *tcase;
tcase = torture_suite_add_rpc_iface_tcase(suite, "atsvc", &ndr_table_atsvc);

2
source4/torture/rpc/bind.c
View File

@ -86,7 +86,7 @@ static void test_bind_op(struct torture_suite *suite,
struct torture_suite *torture_rpc_bind(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "BIND");
struct torture_suite *suite = torture_suite_create(mem_ctx, "bind");
struct {
const char *test_name;
uint32_t flags;

2
source4/torture/rpc/browser.c
View File

@ -114,7 +114,7 @@ bool test_BrowserrQueryOtherDomains(struct torture_context *tctx,
struct torture_suite *torture_rpc_browser(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "BROWSER");
struct torture_suite *suite = torture_suite_create(mem_ctx, "browser");
struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, "browser", &ndr_table_browser);
torture_rpc_tcase_add_test(tcase, "BrowserrQueryOtherDomains", test_BrowserrQueryOtherDomains);

2
source4/torture/rpc/dfs.c
View File

@ -634,7 +634,7 @@ static bool test_FtRoot(struct torture_context *tctx,
struct torture_suite *torture_rpc_dfs(TALLOC_CTX *mem_ctx)
{
struct torture_rpc_tcase *tcase;
struct torture_suite *suite = torture_suite_create(mem_ctx, "DFS");
struct torture_suite *suite = torture_suite_create(mem_ctx, "dfs");
tcase = torture_suite_add_rpc_iface_tcase(suite, "netdfs",
&ndr_table_netdfs);

5
source4/torture/rpc/drsuapi.c
View File

@ -849,10 +849,9 @@ void torture_rpc_drsuapi_tcase(struct torture_suite *suite)
typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
struct torture_test *test;
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "DRSUAPI");
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "drsuapi");
torture_tcase_set_fixture(tcase,
torture_drsuapi_tcase_setup,
torture_tcase_set_fixture(tcase, torture_drsuapi_tcase_setup,
torture_drsuapi_tcase_teardown);
#if 0

4
source4/torture/rpc/drsuapi_cracknames.c
View File

@ -1018,11 +1018,11 @@ void torture_rpc_drsuapi_cracknames_tcase(struct torture_suite *suite)
typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
struct torture_test *test;
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "CRACKNAMES");
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "cracknames");
torture_tcase_set_fixture(tcase,
torture_drsuapi_cracknames_setup,
torture_drsuapi_cracknames_teardown);
test = torture_tcase_add_simple_test(tcase, "CRACKNAMES-TEST", (run_func)test_DsCrackNames);
test = torture_tcase_add_simple_test(tcase, "cracknames-test", (run_func)test_DsCrackNames);
}

2
source4/torture/rpc/dsgetinfo.c
View File

@ -420,7 +420,7 @@ void torture_drs_rpc_dsgetinfo_tcase(struct torture_suite *suite)
typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
struct torture_test *test;
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "DSGETINFO");
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "dsgetinfo");
torture_tcase_set_fixture(tcase,
torture_dsgetinfo_tcase_setup,

2
source4/torture/rpc/dssetup.c
View File

@ -55,7 +55,7 @@ bool test_DsRoleGetPrimaryDomainInformation(struct torture_context *tctx,
struct torture_suite *torture_rpc_dssetup(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "DSSETUP");
struct torture_suite *suite = torture_suite_create(mem_ctx, "dssetup");
struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, "dssetup", &ndr_table_dssetup);
torture_rpc_tcase_add_test(tcase, "DsRoleGetPrimaryDomainInformation", test_DsRoleGetPrimaryDomainInformation);

3
source4/torture/rpc/echo.c
View File

@ -435,8 +435,7 @@ failed:
struct torture_suite *torture_rpc_echo(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(
mem_ctx, "ECHO");
struct torture_suite *suite = torture_suite_create(mem_ctx, "echo");
struct torture_rpc_tcase *tcase;
tcase = torture_suite_add_rpc_iface_tcase(suite, "echo",

4
source4/torture/rpc/epmapper.c
View File

@ -266,9 +266,9 @@ static bool test_InqObject(struct torture_context *tctx, struct dcerpc_pipe *p)
struct torture_suite *torture_rpc_epmapper(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "EPMAPPER");
struct torture_suite *suite = torture_suite_create(mem_ctx, "epmapper");
struct torture_rpc_tcase *tcase;
tcase = torture_suite_add_rpc_iface_tcase(suite, "epmapper",
&ndr_table_epmapper);

2
source4/torture/rpc/eventlog.c
View File

@ -483,7 +483,7 @@ struct torture_suite *torture_rpc_eventlog(TALLOC_CTX *mem_ctx)
struct torture_rpc_tcase *tcase;
struct torture_test *test;
suite = torture_suite_create(mem_ctx, "EVENTLOG");
suite = torture_suite_create(mem_ctx, "eventlog");
tcase = torture_suite_add_rpc_iface_tcase(suite, "eventlog",
&ndr_table_eventlog);

2
source4/torture/rpc/forest_trust.c
View File

@ -827,7 +827,7 @@ struct torture_suite *torture_rpc_lsa_forest_trust(TALLOC_CTX *mem_ctx)
struct torture_suite *suite;
struct torture_rpc_tcase *tcase;
suite = torture_suite_create(mem_ctx, "LSA-FOREST-TRUST");
suite = torture_suite_create(mem_ctx, "lsa.forest.trust");
tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa-forest-trust",
&ndr_table_lsarpc);

2
source4/torture/rpc/frsapi.c
View File

@ -255,7 +255,7 @@ static bool test_InfoW(struct torture_context *tctx,
struct torture_suite *torture_rpc_frsapi(TALLOC_CTX *mem_ctx)
{
struct torture_rpc_tcase *tcase;
struct torture_suite *suite = torture_suite_create(mem_ctx, "FRSAPI");
struct torture_suite *suite = torture_suite_create(mem_ctx, "frsapi");
struct torture_test *test;
tcase = torture_suite_add_rpc_iface_tcase(suite, "frsapi",

2
source4/torture/rpc/handles.c
View File

@ -587,7 +587,7 @@ struct torture_suite *torture_rpc_handles(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite;
suite = torture_suite_create(mem_ctx, "HANDLES");
suite = torture_suite_create(mem_ctx, "handles");
torture_suite_add_simple_test(suite, "lsarpc", test_handles_lsa);
torture_suite_add_simple_test(suite, "lsarpc-shared", test_handles_lsa_shared);
torture_suite_add_simple_test(suite, "samr", test_handles_samr);

2
source4/torture/rpc/initshutdown.c
View File

@ -100,7 +100,7 @@ static bool test_InitEx(struct torture_context *tctx,
struct torture_suite *torture_rpc_initshutdown(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "INITSHUTDOWN");
struct torture_suite *suite = torture_suite_create(mem_ctx, "initshutdown");
struct torture_rpc_tcase *tcase;
struct torture_test *test;

6
source4/torture/rpc/lsa.c
View File

@ -2966,7 +2966,7 @@ struct torture_suite *torture_rpc_lsa_lookup_names(TALLOC_CTX *mem_ctx)
struct torture_suite *suite;
struct torture_rpc_tcase *tcase;
suite = torture_suite_create(mem_ctx, "LSA-LOOKUPNAMES");
suite = torture_suite_create(mem_ctx, "lsa.lookupnames");
tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
&ndr_table_lsarpc);
@ -3029,7 +3029,7 @@ struct torture_suite *torture_rpc_lsa_trusted_domains(TALLOC_CTX *mem_ctx)
state->num_trusts = 12;
suite = torture_suite_create(mem_ctx, "LSA-TRUSTED-DOMAINS");
suite = torture_suite_create(mem_ctx, "lsa.trusted.domains");
tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
&ndr_table_lsarpc);
@ -3084,7 +3084,7 @@ struct torture_suite *torture_rpc_lsa_privileges(TALLOC_CTX *mem_ctx)
struct torture_suite *suite;
struct torture_rpc_tcase *tcase;
suite = torture_suite_create(mem_ctx, "LSA-PRIVILEGES");
suite = torture_suite_create(mem_ctx, "lsa.privileges");
tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
&ndr_table_lsarpc);

Some files were not shown because too many files have changed in this diff Show More