r14817: rename some tests

tridge: is SCAN-EAMAX ok?

metze
(This used to be commit d8529ec2ee079d4ff17681a5d35d260fd3313e88)

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 9c4a8ba48c728cf46785d519ab22fecf45ddc2b5..e7692e144492737b5751279125e740b9de34d057 100644 (file)
--- 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 6c1f8ea01980902c3a7fd7faa8d26f171c963f7f..1c388dd6cb2c584c6f34c3d3936f89115f8c2228 100644 (file)
--- 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},