s3: torture: Add DELETE-PRINT test.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13457

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 42f049858f2037aab5b2097036db3e0375fdbf30)

diff --git a/selftest/knownfail.d/smbspool b/selftest/knownfail.d/smbspool
new file mode 100644 (file)
index 0000000..a61fc4d
--- /dev/null
+++ b/selftest/knownfail.d/smbspool
@@ -0,0 +1 @@
+^samba3.blackbox.smbspool.delete.on.close

diff --git a/source3/script/tests/test_smbspool.sh b/source3/script/tests/test_smbspool.sh
index 899b34d0e40964ee10b65b249b2ba39726ad270b..d95ed06463415a0ec519bb2c5fc230f3cd2e29a1 100755 (executable)
--- a/source3/script/tests/test_smbspool.sh
+++ b/source3/script/tests/test_smbspool.sh
@@ -22,6 +22,7 @@ incdir=`dirname $0`/../../../testprogs/blackbox
 samba_bindir="$BINDIR"
 samba_vlp="$samba_bindir/vlp"
 samba_smbspool="$samba_bindir/smbspool"
+samba_smbtorture3="$samba_bindir/smbtorture3"
 samba_smbspool_krb5="$samba_bindir/smbspool_krb5_wrapper"
 
 test_smbspool_noargs()
@@ -119,6 +120,64 @@ test_vlp_verify()
        fi
 }
 
+test_delete_on_close()
+{
+       tdbfile="$PREFIX_ABS/$TARGET_ENV/lockdir/vlp.tdb"
+       if [ ! -w $tdbfile ]; then
+               echo "vlp tdbfile $tdbfile doesn't exist or is not writeable!"
+               return 1
+       fi
+
+       cmd='$samba_vlp tdbfile=$tdbfile lpq print1 2>&1'
+       eval echo "$cmd"
+       out=$(eval $cmd)
+       ret=$?
+       if [ $ret != 0 ]; then
+               echo "failed to lpq jobs on print1 with $samba_vlp"
+               echo "$out"
+               return 1
+       fi
+
+       num_jobs=$(echo "$out" | wc -l)
+       #
+       # Now run the test DELETE-PRINT from smbtorture3
+       #
+       cmd='$samba_smbtorture3 //$SERVER_IP/print1 -U$USERNAME%$PASSWORD DELETE-PRINT 2>&1'
+       eval echo "$cmd"
+       out_t=$(eval $cmd)
+       ret=$?
+       if [ $ret != 0 ]; then
+               echo "failed to run DELETE-PRINT on print1"
+               echo "$out_t"
+               return 1
+       fi
+
+       cmd='$samba_vlp tdbfile=$tdbfile lpq print1 2>&1'
+       eval echo "$cmd"
+       out1=$(eval $cmd)
+       ret=$?
+       if [ $ret != 0 ]; then
+               echo "(2) failed to lpq jobs on print1 with $samba_vlp"
+               echo "$out1"
+               return 1
+       fi
+       num_jobs1=$(echo "$out1" | wc -l)
+
+       #
+       # Number of jobs should not change. Job
+       # should not have made it to backend.
+       #
+       if [ "$num_jobs1" -ne "$num_jobs" ]; then
+               echo "delete-on-close fail $num_jobs1 -ne $num_jobs"
+               echo "$out"
+               echo "$out_t"
+               echo "$out1"
+               return 1
+       fi
+
+       return 0
+}
+
 testit "smbspool no args" \
        test_smbspool_noargs $samba_smbspool || \
        failed=$(expr $failed + 1)
@@ -180,4 +239,8 @@ testit "vlp verify example.ps" \
        failed=$(expr $failed + 1)
 unset AUTH_INFO_REQUIRED
 
+testit "delete on close" \
+       test_delete_on_close \
+       || failed=$(expr $failed + 1)
+
 exit $failed

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index e8944b493d2fb5111f4447bdc1154ac540b62d74..dc35bda21d0f823604a5f15df0ccbf05d91c1aca 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4560,6 +4560,78 @@ static bool run_deletetest(int dummy)
        return correct;
 }
 
+/*
+  Exercise delete on close semantics - use on the PRINT1 share in torture
+  testing.
+ */
+static bool run_delete_print_test(int dummy)
+{
+       struct cli_state *cli1 = NULL;
+       const char *fname = "print_delete.file";
+       uint16_t fnum1 = (uint16_t)-1;
+       bool correct = false;
+       const char *buf = "print file data\n";
+       NTSTATUS status;
+
+       printf("starting print delete test\n");
+
+       if (!torture_open_connection(&cli1, 0)) {
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+
+       status = cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS,
+                             FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF,
+                             0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("open of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_writeall(cli1,
+                       fnum1,
+                       0,
+                       (const uint8_t *)buf,
+                       0, /* offset */
+                       strlen(buf), /* size */
+                       NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("writing print file data failed (%s)\n",
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_nt_delete_on_close(cli1, fnum1, true);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("setting delete_on_close failed (%s)\n",
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed (%s)\n", nt_errstr(status));
+               goto fail;
+       }
+
+       printf("finished print delete test\n");
+
+       correct = true;
+
+  fail:
+
+       if (fnum1 != (uint16_t)-1) {
+               cli_close(cli1, fnum1);
+       }
+
+       if (cli1 && !torture_close_connection(cli1)) {
+               correct = false;
+       }
+       return correct;
+}
 
 /*
   Test wildcard delete.
@@ -11550,6 +11622,7 @@ static struct {
        {"RENAME-ACCESS", run_rename_access, 0},
        {"OWNER-RIGHTS", run_owner_rights, 0},
        {"DELETE", run_deletetest, 0},
+       {"DELETE-PRINT", run_delete_print_test, 0},
        {"WILDDELETE", run_wild_deletetest, 0},
        {"DELETE-LN", run_deletetest_ln, 0},
        {"PROPERTIES", run_properties, 0},