From: Ralph Boehme Date: Tue, 17 Jul 2018 13:56:05 +0000 (+0200) Subject: s4: torture: run test_durable_v2_open_reopen2_lease() in a subdirectory X-Git-Tag: samba-4.7.10~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c373043eb13506e92728e2b7ce360b32f401160;p=thirdparty%2Fsamba.git s4: torture: run test_durable_v2_open_reopen2_lease() in a subdirectory Bug: https://bugzilla.samba.org/show_bug.cgi?id=13535 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 725319743f1f2de934cbde477ca84430f5b2b4b4) --- diff --git a/selftest/knownfail.d/samba3.smb2.durable-v2-open b/selftest/knownfail.d/samba3.smb2.durable-v2-open new file mode 100644 index 00000000000..facf1d0b543 --- /dev/null +++ b/selftest/knownfail.d/samba3.smb2.durable-v2-open @@ -0,0 +1 @@ +^samba3.smb2.durable-v2-open.reopen2-lease-v2\(nt4_dc\)$ diff --git a/source4/torture/smb2/durable_v2_open.c b/source4/torture/smb2/durable_v2_open.c index 3a0e0707d2c..0a928ec8c26 100644 --- a/source4/torture/smb2/durable_v2_open.c +++ b/source4/torture/smb2/durable_v2_open.c @@ -1518,9 +1518,15 @@ bool test_durable_v2_open_reopen2_lease_v2(struct torture_context *tctx, options = tree->session->transport->options; + smb2_deltree(tree, __func__); + status = torture_smb2_testdir(tree, __func__, &_h); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "torture_smb2_testdir failed\n"); + smb2_util_close(tree, _h); + /* Choose a random name in case the state is left a little funky. */ - snprintf(fname, 256, "durable_v2_open_reopen2_%s.dat", - generate_random_str(tctx, 8)); + snprintf(fname, 256, "%s\\durable_v2_open_reopen2_%s.dat", + __func__, generate_random_str(tctx, 8)); smb2_util_unlink(tree, fname); @@ -1726,6 +1732,7 @@ done: } smb2_util_unlink(tree, fname); + smb2_deltree(tree, __func__); talloc_free(tree);