summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-30 11:58:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:23 -0500
commit9845c8c4756a33566819c883b5fb0611ff84f94c (patch)
tree9559560cf98586a5eaaf783d1d08fb9e28a9d6d0 /source4/torture
parent45e4982ccaecf2fc3ca6716767a8e343625a280d (diff)
downloadsamba-9845c8c4756a33566819c883b5fb0611ff84f94c.tar.gz
samba-9845c8c4756a33566819c883b5fb0611ff84f94c.tar.bz2
samba-9845c8c4756a33566819c883b5fb0611ff84f94c.zip
r14817: rename some tests
tridge: is SCAN-EAMAX ok? metze (This used to be commit d8529ec2ee079d4ff17681a5d35d260fd3313e88)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rap/rap.c4
-rw-r--r--source4/torture/torture.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 9c4a8ba48c..e7692e1444 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -428,7 +428,7 @@ static BOOL test_rap(struct smbcli_state *cli)
return res;
}
-BOOL torture_raw_rap(struct torture_context *torture)
+BOOL torture_rap_basic(struct torture_context *torture)
{
struct smbcli_state *cli;
BOOL ret = True;
@@ -438,7 +438,7 @@ BOOL torture_raw_rap(struct torture_context *torture)
return False;
}
- mem_ctx = talloc_init("torture_raw_rap");
+ mem_ctx = talloc_init("torture_rap_basic");
if (!test_rap(cli)) {
ret = False;
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 6c1f8ea019..1c388dd6cb 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -610,10 +610,8 @@ static struct {
{"RAW-RENAME", torture_raw_rename, 0},
{"RAW-SEEK", torture_raw_seek, 0},
{"RAW-EAS", torture_raw_eas, 0},
- {"RAW-EAMAX", torture_max_eas, 0},
{"RAW-STREAMS", torture_raw_streams, 0},
{"RAW-ACLS", torture_raw_acls, 0},
- {"RAW-RAP", torture_raw_rap, 0},
{"RAW-COMPOSITE", torture_raw_composite, 0},
/* SMB2 tests */
@@ -626,11 +624,15 @@ static struct {
{"SMB2-SETINFO", torture_smb2_setinfo, 0},
{"SMB2-FIND", torture_smb2_find, 0},
+ /* RAP tests */
+ {"RAP-BASIC", torture_rap_basic, 0},
+
/* protocol scanners */
{"SCAN-MAXFID", NULL, run_maxfidtest},
{"SCAN-PIPE_NUMBER", run_pipe_number, 0},
{"SCAN-IOCTL", torture_ioctl_test, 0},
{"SCAN-RAP", torture_rap_scan, 0},
+ {"SCAN-EAMAX", torture_max_eas, 0},
/* local (no server) testers */
{"LOCAL-NTLMSSP", torture_ntlmssp_self_check, 0},