svn commit: samba r24892 - in branches/SAMBA_4_0: . source source/torture/rpc

jelmer at samba.org jelmer at samba.org
Sun Sep 2 13:30:34 GMT 2007


Author: jelmer
Date: 2007-09-02 13:30:28 +0000 (Sun, 02 Sep 2007)
New Revision: 24892

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

Log:
Skip some tests that were previously being incorrectly treated as succeeding.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/samba4-skip
   branches/SAMBA_4_0/source/torture/rpc/alter_context.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/samba4-skip
===================================================================
--- branches/SAMBA_4_0/source/samba4-skip	2007-09-02 12:53:46 UTC (rev 24891)
+++ branches/SAMBA_4_0/source/samba4-skip	2007-09-02 13:30:28 UTC (rev 24892)
@@ -3,7 +3,6 @@
 RAW-COMPOSITE
 RAW-OPLOCK
 BASE-IOMETER
-BASE-SAMBA3ERROR
 BASE-CASETABLE
 BASE-NTTRANS
 .*BASE-BENCH-HOLDCON.*				# Very slow
@@ -35,6 +34,12 @@
 ntvfs/cifs RAW-QFILEINFO-IPC
 RPC-DSSYNC
 RPC-SAMSYNC
-LDAP-UPTODATEVECTOR
+LDAP-UPTODATEVECTOR					# Segfaults
 RPC-SCANNER							# Very slow
+RPC-REMACT							# Not provided by Samba 4
+RPC-OXIDRESOLVE						# Not provided by Samba 4
+RPC-EVENTLOG						# Not provided by Samba 4
+RPC-INITSHUTDOWN					# Not provided by Samba 4
+RPC-SVCCTL							# Not provided by Samba 4
+RPC-ATSVC							# Not provided by Samba 4
 .*SAMBA3.*							# Samba3-specific test

Modified: branches/SAMBA_4_0/source/torture/rpc/alter_context.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/alter_context.c	2007-09-02 12:53:46 UTC (rev 24891)
+++ branches/SAMBA_4_0/source/torture/rpc/alter_context.c	2007-09-02 13:30:28 UTC (rev 24892)
@@ -30,50 +30,36 @@
 {
         NTSTATUS status;
         struct dcerpc_pipe *p, *p2;
-	TALLOC_CTX *mem_ctx;
-	BOOL ret = True;
 	struct policy_handle *handle;
 	struct ndr_interface_table tmptbl;
 	struct ndr_syntax_id syntax;
 	struct ndr_syntax_id transfer_syntax;
+	bool ret = true;
 
-	mem_ctx = talloc_init("torture_rpc_alter_context");
-
 	torture_comment(torture, "opening LSA connection\n");
 	status = torture_rpc_connection(torture, &p, &ndr_table_lsarpc);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		return False;
-	}
+	torture_assert_ntstatus_ok(torture, status, "connecting");
 
-	if (!test_lsa_OpenPolicy2(p, mem_ctx, &handle)) {
-		ret = False;
+	if (!test_lsa_OpenPolicy2(p, torture, &handle)) {
+		ret = false;
 	}
 
 	torture_comment(torture, "Opening secondary DSSETUP context\n");
 	status = dcerpc_secondary_context(p, &p2, &ndr_table_dssetup);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		torture_comment(torture, "dcerpc_alter_context failed - %s\n", nt_errstr(status));
-		return False;
-	}
+	torture_assert_ntstatus_ok(torture, status, "dcerpc_alter_context failed");
 
 	tmptbl = ndr_table_dssetup;
 	tmptbl.syntax_id.if_version += 100;
 	torture_comment(torture, "Opening bad secondary connection\n");
 	status = dcerpc_secondary_context(p, &p2, &tmptbl);
-	if (NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		torture_comment(torture, "dcerpc_alter_context with wrong version should fail\n");
-		return False;
-	}
+	torture_assert_ntstatus_ok(torture, status, "dcerpc_alter_context with wrong version should fail");
 
 	torture_comment(torture, "testing DSSETUP pipe operations\n");
-	ret &= test_DsRoleGetPrimaryDomainInformation(p2, mem_ctx);
+	ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
 
 	if (handle) {
-		if (!test_lsa_Close(p, mem_ctx, handle)) {
-			ret = False;
+		if (!test_lsa_Close(p, torture, handle)) {
+			ret = false;
 		}
 	}
 
@@ -81,33 +67,27 @@
 	transfer_syntax = p->transfer_syntax;
 
 	torture_comment(torture, "Testing change of primary context\n");
-	status = dcerpc_alter_context(p, mem_ctx, &p2->syntax, &p2->transfer_syntax);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		torture_comment(torture, "dcerpc_alter_context failed - %s\n", nt_errstr(status));
-		return False;
-	}
+	status = dcerpc_alter_context(p, torture, &p2->syntax, &p2->transfer_syntax);
+	torture_assert_ntstatus_ok(torture, status, "dcerpc_alter_context failed");
 
 	torture_comment(torture, "testing DSSETUP pipe operations - should fault\n");
-	if (test_DsRoleGetPrimaryDomainInformation(p, mem_ctx)) {
-		ret = False;
+	if (test_DsRoleGetPrimaryDomainInformation(torture, p)) {
+		ret = false;
 	}
 
-	if (!test_lsa_OpenPolicy2(p, mem_ctx, &handle)) {
-		ret = False;
+	if (!test_lsa_OpenPolicy2(p, torture, &handle)) {
+		ret = false;
 	}
 
 	if (handle) {
-		if (!test_lsa_Close(p, mem_ctx, handle)) {
-			ret = False;
+		if (!test_lsa_Close(p, torture, handle)) {
+			ret = false;
 		}
 	}
 
 	torture_comment(torture, "testing DSSETUP pipe operations\n");
 
-	ret &= test_DsRoleGetPrimaryDomainInformation(p2, mem_ctx);
+	ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
 
-	talloc_free(mem_ctx);
-
 	return ret;
 }



More information about the samba-cvs mailing list