svn commit: samba r14817 - in branches/SAMBA_4_0/source/torture: . rap

[metze at samba.org]

Author: metze
Date: 2006-03-30 11:58:46 +0000 (Thu, 30 Mar 2006)
New Revision: 14817

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14817

Log:
rename some tests

tridge: is SCAN-EAMAX ok?

metze
Modified:
   branches/SAMBA_4_0/source/torture/rap/rap.c
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rap/rap.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rap/rap.c	2006-03-30 11:20:47 UTC (rev 14816)
+++ branches/SAMBA_4_0/source/torture/rap/rap.c	2006-03-30 11:58:46 UTC (rev 14817)
@@ -428,7 +428,7 @@
 	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 @@
 		return False;
 	}
 
-	mem_ctx = talloc_init("torture_raw_rap");
+	mem_ctx = talloc_init("torture_rap_basic");
 
 	if (!test_rap(cli)) {
 		ret = False;

Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c	2006-03-30 11:20:47 UTC (rev 14816)
+++ branches/SAMBA_4_0/source/torture/torture.c	2006-03-30 11:58:46 UTC (rev 14817)
@@ -610,10 +610,8 @@
 	{"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 @@
 	{"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},