r23792: convert Samba4 to GPLv3

[samba.git] / source4 / torture / basic / unlink.c

diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index f046d68b6ed59f77fcf259ea8cf2a6988e9c0182..60d5a1554d2a846d1a4f4c0e9c32a7196ed866d7 100644 (file)
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,13 +16,15 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
+#include "torture/util.h"
 
 #define BASEDIR "\\unlinktest"
 
@@ -31,49 +33,36 @@
 
   1) the server does not allow an unlink on a file that is open
 */
-BOOL torture_unlinktest(void)
+BOOL torture_unlinktest(struct torture_context *tctx, struct smbcli_state *cli)
 {
-       struct smbcli_state *cli;
        const char *fname = BASEDIR "\\unlink.tst";
        int fnum;
        BOOL correct = True;
        union smb_open io;
        NTSTATUS status;
 
-       if (!torture_open_connection(&cli)) {
-               return False;
-       }
-
-       printf("starting unlink test\n");
-
-       if (!torture_setup_dir(cli, BASEDIR)) {
-               return False;
-       }
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR), 
+                                  talloc_asprintf(tctx, "Failed setting up %s", BASEDIR));
 
        cli->session->pid = 1;
 
-       printf("Opening a file\n");
+       torture_comment(tctx, "Opening a file\n");
 
        fnum = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-       if (fnum == -1) {
-               printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli->tree));
-               return False;
-       }
-
-       printf("Unlinking a open file\n");
-
-       if (NT_STATUS_IS_OK(smbcli_unlink(cli->tree, fname))) {
-               printf("(%s) error: server allowed unlink on an open file\n", __location__);
-               correct = False;
-       } else {
-               correct = check_error(__location__, cli, ERRDOS, ERRbadshare, 
+       torture_assert(tctx, fnum != -1, talloc_asprintf(tctx, "open of %s failed (%s)", fname, smbcli_errstr(cli->tree)));
+
+       torture_comment(tctx, "Unlinking a open file\n");
+
+       torture_assert(tctx, !NT_STATUS_IS_OK(smbcli_unlink(cli->tree, fname)),
+               "server allowed unlink on an open file");
+       
+       correct = check_error(__location__, cli, ERRDOS, ERRbadshare, 
                                      NT_STATUS_SHARING_VIOLATION);
-       }
 
        smbcli_close(cli->tree, fnum);
        smbcli_unlink(cli->tree, fname);
 
-       printf("testing unlink after ntcreatex with DELETE access\n");
+       torture_comment(tctx, "testing unlink after ntcreatex with DELETE access\n");
 
        io.ntcreatex.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.root_fid = 0;
@@ -89,23 +78,14 @@ BOOL torture_unlinktest(void)
        io.ntcreatex.in.access_mask  = SEC_RIGHTS_FILE_ALL;
 
        status = smb_raw_open(cli->tree, cli, &io);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("(%s) failed to open %s\n", __location__, fname);
-       }
-       if (NT_STATUS_IS_OK(smbcli_unlink(cli->tree, fname))) {
-               printf("(%s) error: server allowed unlink on an open file\n", __location__);
-               correct = False;
-       } else {
-               correct = check_error(__location__, cli, ERRDOS, ERRbadshare, 
-                                     NT_STATUS_SHARING_VIOLATION);
-       }
+       torture_assert_ntstatus_ok(tctx, status, talloc_asprintf(tctx, "failed to open %s", fname));
 
-       if (!torture_close_connection(cli)) {
-               correct = False;
-       }
+       torture_assert(tctx, !NT_STATUS_IS_OK(smbcli_unlink(cli->tree, fname)),
+               "server allowed unlink on an open file");
+
+       correct = check_error(__location__, cli, ERRDOS, ERRbadshare, 
+                                     NT_STATUS_SHARING_VIOLATION);
 
-       printf("unlink test finished\n");
-       
        return correct;
 }