r24892: Skip some tests that were previously being incorrectly treated as succeeding.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Sep 2007 13:30:28 +0000 (13:30 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 20:03:30 +0000 (15:03 -0500)
(This used to be commit b5b8e879a1bbb5329458f05120619ea439904962)

source4/samba4-skip
source4/torture/rpc/alter_context.c

index 1e60313d0d42f1427e1707445e1b1198fcdc42d3..a0ad0f50dcbbf133a37b6ca7d1fbe0a7367a2af5 100644 (file)
@@ -3,7 +3,6 @@ BASE-DELAYWRITE
 RAW-COMPOSITE
 RAW-OPLOCK
 BASE-IOMETER
-BASE-SAMBA3ERROR
 BASE-CASETABLE
 BASE-NTTRANS
 .*BASE-BENCH-HOLDCON.*                         # Very slow
@@ -35,6 +34,12 @@ ntvfs/cifs RAW-CONTEXT
 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
index 6dd0b40d7bdb47e8ec7b31e9b8fcaba68d4af10a..34da133de8b378aab91871aea72ef3f224983f7d 100644 (file)
@@ -30,50 +30,36 @@ bool torture_rpc_alter_context(struct torture_context *torture)
 {
         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;
-
-       mem_ctx = talloc_init("torture_rpc_alter_context");
+       bool ret = true;
 
        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 @@ bool torture_rpc_alter_context(struct torture_context *torture)
        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);
-
-       talloc_free(mem_ctx);
+       ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
 
        return ret;
 }