Author: kai
Date: 2007-11-20 09:33:14 +0000 (Tue, 20 Nov 2007)
New Revision: 26048

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

Log:
spoolss: Fix test_SecondaryClosePrinter.

The test was trying to be too smart. Fixed to not reuse test_ClosePrinter.

Modified:
   branches/SAMBA_4_0/source/torture/rpc/spoolss.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/spoolss.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/spoolss.c     2007-11-20 09:17:05 UTC 
(rev 26047)
+++ branches/SAMBA_4_0/source/torture/rpc/spoolss.c     2007-11-20 09:33:14 UTC 
(rev 26048)
@@ -1297,7 +1297,7 @@
        NTSTATUS status;
        struct dcerpc_binding *b;
        struct dcerpc_pipe *p2;
-       bool ret = true;
+       struct spoolss_ClosePrinter cp;
 
        /* only makes sense on SMB */
        if (p->conn->transport.transport != NCACN_NP) {
@@ -1315,11 +1315,13 @@
        status = dcerpc_bind_auth_none(p2, &ndr_table_spoolss);
        torture_assert_ntstatus_ok(tctx, status, "Failed to create bind on 
secondary connection");
 
-       if (test_ClosePrinter(tctx, p2, handle)) {
-               torture_comment(tctx, "ERROR: Allowed close on secondary 
connection!\n");
-               ret = false;
-       }
+       cp.in.handle = handle;
+       cp.out.handle = handle;
 
+       status = dcerpc_spoolss_ClosePrinter(p2, tctx, &cp);
+       torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NET_WRITE_FAULT,
+                       "ERROR: Allowed close on secondary connection");
+
        torture_assert_int_equal(tctx, p2->last_fault_code, 
DCERPC_FAULT_CONTEXT_MISMATCH, 
                                 "Unexpected fault code");
 

Reply via email to