test suite for SMB2 durable opens
Copyright (C) Stefan Metzmacher 2008
+ Copyright (C) Michael Adam 2011-2012
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
#include "includes.h"
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
+#include "../libcli/smb/smbXcli_base.h"
#include "torture/torture.h"
#include "torture/smb2/proto.h"
+#include "../libcli/smb/smbXcli_base.h"
#define CHECK_VAL(v, correct) do { \
if ((v) != (correct)) { \
- torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s got 0x%x - should be 0x%x\n", \
- __location__, #v, (int)v, (int)correct); \
+ torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s got 0x%llx - should be 0x%llx\n", \
+ __location__, #v, (unsigned long long)v, (unsigned long long)correct); \
+ ret = false; \
+ }} while (0)
+
+#define CHECK_NOT_VAL(v, correct) do { \
+ if ((v) == (correct)) { \
+ torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s got 0x%llx - should not be 0x%llx\n", \
+ __location__, #v, (unsigned long long)v, (unsigned long long)correct); \
ret = false; \
}} while (0)
#define NUM_OPLOCK_TYPES 4
#define NUM_SHARE_MODES 8
#define NUM_OPLOCK_OPEN_TESTS ( NUM_OPLOCK_TYPES * NUM_SHARE_MODES )
-struct durable_open_vs_oplock durable_open_vs_oplock_table[NUM_OPLOCK_OPEN_TESTS] =
+static struct durable_open_vs_oplock durable_open_vs_oplock_table[NUM_OPLOCK_OPEN_TESTS] =
{
{ "", "", false },
{ "", "R", false },
{ "b", "RWD", true },
};
-static bool test_one_durable_open_open1(struct torture_context *tctx,
- struct smb2_tree *tree,
- const char *fname,
- struct durable_open_vs_oplock test)
+static bool test_one_durable_open_open_oplock(struct torture_context *tctx,
+ struct smb2_tree *tree,
+ const char *fname,
+ struct durable_open_vs_oplock test)
{
NTSTATUS status;
TALLOC_CTX *mem_ctx = talloc_new(tctx);
return ret;
}
-bool test_durable_open_open1(struct torture_context *tctx,
- struct smb2_tree *tree)
+bool test_durable_open_open_oplock(struct torture_context *tctx,
+ struct smb2_tree *tree)
{
TALLOC_CTX *mem_ctx = talloc_new(tctx);
char fname[256];
int i;
/* Choose a random name in case the state is left a little funky. */
- snprintf(fname, 256, "durable_open_open1_%s.dat", generate_random_str(tctx, 8));
+ snprintf(fname, 256, "durable_open_open_oplock_%s.dat", generate_random_str(tctx, 8));
smb2_util_unlink(tree, fname);
/* test various oplock levels with durable open */
for (i = 0; i < NUM_OPLOCK_OPEN_TESTS; i++) {
- ret = test_one_durable_open_open1(tctx,
- tree,
- fname,
- durable_open_vs_oplock_table[i]);
+ ret = test_one_durable_open_open_oplock(tctx,
+ tree,
+ fname,
+ durable_open_vs_oplock_table[i]);
if (ret == false) {
goto done;
}
#define NUM_LEASE_TYPES 5
#define NUM_LEASE_OPEN_TESTS ( NUM_LEASE_TYPES * NUM_SHARE_MODES )
-struct durable_open_vs_lease durable_open_vs_lease_table[NUM_LEASE_OPEN_TESTS] =
+static struct durable_open_vs_lease durable_open_vs_lease_table[NUM_LEASE_OPEN_TESTS] =
{
{ "", "", false },
{ "", "R", false },
{ "RHW", "RWD", true },
};
-static bool test_one_durable_open_open2(struct torture_context *tctx,
- struct smb2_tree *tree,
- const char *fname,
- struct durable_open_vs_lease test)
+static bool test_one_durable_open_open_lease(struct torture_context *tctx,
+ struct smb2_tree *tree,
+ const char *fname,
+ struct durable_open_vs_lease test)
{
NTSTATUS status;
TALLOC_CTX *mem_ctx = talloc_new(tctx);
struct smb2_create io;
struct smb2_lease ls;
uint64_t lease;
+ uint32_t caps;
+
+ caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
+ if (!(caps & SMB2_CAP_LEASING)) {
+ torture_skip(tctx, "leases are not supported");
+ }
smb2_util_unlink(tree, fname);
return ret;
}
-bool test_durable_open_open2(struct torture_context *tctx,
- struct smb2_tree *tree)
+bool test_durable_open_open_lease(struct torture_context *tctx,
+ struct smb2_tree *tree)
{
TALLOC_CTX *mem_ctx = talloc_new(tctx);
char fname[256];
bool ret = true;
int i;
+ uint32_t caps;
+
+ caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
+ if (!(caps & SMB2_CAP_LEASING)) {
+ torture_skip(tctx, "leases are not supported");
+ }
/* Choose a random name in case the state is left a little funky. */
- snprintf(fname, 256, "durable_open_open2_%s.dat", generate_random_str(tctx, 8));
+ snprintf(fname, 256, "durable_open_open_lease_%s.dat", generate_random_str(tctx, 8));
smb2_util_unlink(tree, fname);
/* test various oplock levels with durable open */
for (i = 0; i < NUM_LEASE_OPEN_TESTS; i++) {
- ret = test_one_durable_open_open2(tctx,
- tree,
- fname,
- durable_open_vs_lease_table[i]);
+ ret = test_one_durable_open_open_lease(tctx,
+ tree,
+ fname,
+ durable_open_vs_lease_table[i]);
if (ret == false) {
goto done;
}
return ret;
}
+/**
+ * basic test for doing a durable open
+ * tcp disconnect, reconnect with a session reconnect and
+ * do a durable reopen (succeeds)
+ */
+bool test_durable_open_reopen2a(struct torture_context *tctx,
+ struct smb2_tree *tree)
+{
+ NTSTATUS status;
+ TALLOC_CTX *mem_ctx = talloc_new(tctx);
+ char fname[256];
+ struct smb2_handle _h;
+ struct smb2_handle *h = NULL;
+ struct smb2_create io1, io2;
+ uint64_t previous_session_id;
+ bool ret = true;
+
+ /* Choose a random name in case the state is left a little funky. */
+ snprintf(fname, 256, "durable_open_reopen2_%s.dat",
+ generate_random_str(tctx, 8));
+
+ smb2_util_unlink(tree, fname);
+
+ smb2_oplock_create_share(&io1, fname,
+ smb2_util_share_access(""),
+ smb2_util_oplock_level("b"));
+ io1.in.durable_open = true;
+
+ status = smb2_create(tree, mem_ctx, &io1);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ _h = io1.out.file.handle;
+ h = &_h;
+ CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+ CHECK_VAL(io1.out.durable_open, true);
+ CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+ /* disconnect, reconnect and then do durable reopen */
+ previous_session_id = smb2cli_session_current_id(tree->session->smbXcli);
+ talloc_free(tree);
+ tree = NULL;
+
+ if (!torture_smb2_connection_ext(tctx, previous_session_id, &tree)) {
+ torture_warning(tctx, "couldn't reconnect, bailing\n");
+ ret = false;
+ goto done;
+ }
+
+ ZERO_STRUCT(io2);
+ io2.in.fname = fname;
+ io2.in.durable_handle = h;
+ h = NULL;
+
+ status = smb2_create(tree, mem_ctx, &io2);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+ CHECK_VAL(io2.out.durable_open, true);
+ CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+ _h = io2.out.file.handle;
+ h = &_h;
+
+done:
+ if (h != NULL) {
+ smb2_util_close(tree, *h);
+ }
+
+ smb2_util_unlink(tree, fname);
+
+ talloc_free(tree);
+
+ talloc_free(mem_ctx);
+
+ return ret;
+}
+
+
/**
* basic test for doing a durable open:
* tdis, new tcon, try durable reopen (fails)
struct smb2_create io1, io2;
bool ret = true;
struct smb2_transport *transport;
+ struct smb2_session *session2;
struct smb2_tree *tree2;
/* Choose a random name in case the state is left a little funky. */
CHECK_VAL(io1.out.durable_open, true);
CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
- /* disconnect, reconnect and then do durable reopen */
+ /*
+ * do a session logoff, establish a new session and tree
+ * connect on the same transport, and try a durable reopen
+ */
transport = tree->session->transport;
status = smb2_logoff(tree->session);
CHECK_STATUS(status, NT_STATUS_OK);
- if (!torture_smb2_session_setup(tctx, transport, mem_ctx, &tree->session)) {
+ if (!torture_smb2_session_setup(tctx, transport,
+ 0, /* previous_session_id */
+ mem_ctx, &session2))
+ {
torture_warning(tctx, "session setup failed.\n");
ret = false;
goto done;
}
- ZERO_STRUCT(io2);
- io2.in.fname = fname;
- io2.in.durable_handle = h;
-
- status = smb2_create(tree, mem_ctx, &io2);
- CHECK_STATUS(status, NT_STATUS_NETWORK_NAME_DELETED);
+ /*
+ * the session setup has talloc-stolen the transport,
+ * so we can safely free the old tree+session for clarity
+ */
+ TALLOC_FREE(tree);
- if (!torture_smb2_tree_connect(tctx, tree->session, mem_ctx, &tree2)) {
+ if (!torture_smb2_tree_connect(tctx, session2, mem_ctx, &tree2)) {
torture_warning(tctx, "tree connect failed.\n");
ret = false;
goto done;
ZERO_STRUCT(io2);
io2.in.fname = fname;
io2.in.durable_handle = h;
+ h = NULL;
status = smb2_create(tree2, mem_ctx, &io2);
CHECK_STATUS(status, NT_STATUS_OK);
done:
if (h != NULL) {
- smb2_util_close(tree, *h);
+ smb2_util_close(tree2, *h);
}
smb2_util_unlink(tree2, fname);
return ret;
}
+bool test_durable_open_delete_on_close1(struct torture_context *tctx,
+ struct smb2_tree *tree)
+{
+ NTSTATUS status;
+ TALLOC_CTX *mem_ctx = talloc_new(tctx);
+ char fname[256];
+ struct smb2_handle _h;
+ struct smb2_handle *h = NULL;
+ struct smb2_create io1, io2, io3;
+ bool ret = true;
+ struct smb2_transport *transport;
+ struct smb2_session *session2;
+ struct smb2_tree *tree2;
+ union smb_fileinfo info1, info2;
+
+ /* Choose a random name in case the state is left a little funky. */
+ snprintf(fname, 256, "durable_open_delete_on_close1_%s.dat",
+ generate_random_str(tctx, 8));
+
+ smb2_util_unlink(tree, fname);
+
+ smb2_oplock_create_share(&io1, fname,
+ smb2_util_share_access(""),
+ smb2_util_oplock_level("b"));
+ io1.in.durable_open = true;
+ io1.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE;
+
+ status = smb2_create(tree, mem_ctx, &io1);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ _h = io1.out.file.handle;
+ h = &_h;
+ CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+ CHECK_VAL(io1.out.durable_open, true);
+ CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+ ZERO_STRUCT(info1);
+ info1.internal_information.level = RAW_FILEINFO_INTERNAL_INFORMATION;
+ info1.internal_information.in.file.handle = _h;
+ status = smb2_getinfo_file(tree, tree, &info1);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ /*
+ * do a session logoff, establish a new session and tree
+ * connect on the same transport, and try a durable reopen
+ */
+ transport = tree->session->transport;
+ status = smb2_logoff(tree->session);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ if (!torture_smb2_session_setup(tctx, transport,
+ 0, /* previous_session_id */
+ mem_ctx, &session2))
+ {
+ torture_warning(tctx, "session setup failed.\n");
+ ret = false;
+ goto done;
+ }
+
+ /*
+ * the session setup has talloc-stolen the transport,
+ * so we can safely free the old tree+session for clarity
+ */
+ TALLOC_FREE(tree);
+
+ if (!torture_smb2_tree_connect(tctx, session2, mem_ctx, &tree2)) {
+ torture_warning(tctx, "tree connect failed.\n");
+ ret = false;
+ goto done;
+ }
+
+ ZERO_STRUCT(io3);
+ io3.in.fname = fname;
+ io3.in.durable_handle = h;
+ h = NULL;
+
+ smb2_oplock_create_share(&io2, fname,
+ smb2_util_share_access(""),
+ smb2_util_oplock_level("b"));
+ io2.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE;
+
+ status = smb2_create(tree2, mem_ctx, &io2);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ _h = io2.out.file.handle;
+ h = &_h;
+ CHECK_CREATED(&io2, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+ CHECK_VAL(io2.out.durable_open, false);
+ CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+
+ ZERO_STRUCT(info2);
+ info2.internal_information.level = RAW_FILEINFO_INTERNAL_INFORMATION;
+ info2.internal_information.in.file.handle = _h;
+ status = smb2_getinfo_file(tree2, tree2, &info2);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ CHECK_NOT_VAL(info1.internal_information.out.file_id,
+ info2.internal_information.out.file_id);
+
+ status = smb2_create(tree2, mem_ctx, &io3);
+ CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+done:
+ if (h != NULL) {
+ smb2_util_close(tree2, *h);
+ }
+
+ smb2_util_unlink(tree2, fname);
+
+ talloc_free(tree);
+ talloc_free(tree2);
+
+ talloc_free(mem_ctx);
+
+ return ret;
+}
+
/*
basic testing of SMB2 durable opens
regarding the position information on the handle
char fname[256];
bool ret = true;
uint64_t lease1, lease2;
+ uint32_t caps;
+
+ caps = smb2cli_conn_server_capabilities(tree1->session->transport->conn);
+ if (!(caps & SMB2_CAP_LEASING)) {
+ torture_skip(tctx, "leases are not supported");
+ }
/*
* Choose a random name and random lease in case the state is left a
return ret;
}
+bool test_durable_open_lock_oplock(struct torture_context *tctx,
+ struct smb2_tree *tree)
+{
+ TALLOC_CTX *mem_ctx = talloc_new(tctx);
+ struct smb2_create io;
+ struct smb2_handle h;
+ struct smb2_lock lck;
+ struct smb2_lock_element el[2];
+ NTSTATUS status;
+ char fname[256];
+ bool ret = true;
+
+ /*
+ */
+ snprintf(fname, 256, "durable_open_oplock_lock_%s.dat", generate_random_str(tctx, 8));
+
+ /* Clean slate */
+ smb2_util_unlink(tree, fname);
+
+ /* Create with lease */
+
+ smb2_oplock_create_share(&io, fname,
+ smb2_util_share_access(""),
+ smb2_util_oplock_level("b"));
+ io.in.durable_open = true;
+
+ status = smb2_create(tree, mem_ctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ h = io.out.file.handle;
+ CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+
+ CHECK_VAL(io.out.durable_open, true);
+ CHECK_VAL(io.out.oplock_level, smb2_util_oplock_level("b"));
+
+ ZERO_STRUCT(lck);
+ ZERO_STRUCT(el);
+ lck.in.locks = el;
+ lck.in.lock_count = 0x0001;
+ lck.in.lock_sequence = 0x00000000;
+ lck.in.file.handle = h;
+ el[0].offset = 0;
+ el[0].length = 1;
+ el[0].reserved = 0x00000000;
+ el[0].flags = SMB2_LOCK_FLAG_EXCLUSIVE;
+ status = smb2_lock(tree, &lck);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ /* Disconnect/Reconnect. */
+ talloc_free(tree);
+ tree = NULL;
+
+ if (!torture_smb2_connection(tctx, &tree)) {
+ torture_warning(tctx, "couldn't reconnect, bailing\n");
+ ret = false;
+ goto done;
+ }
+
+ ZERO_STRUCT(io);
+ io.in.fname = fname;
+ io.in.durable_handle = &h;
+
+ status = smb2_create(tree, mem_ctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ h = io.out.file.handle;
+
+ lck.in.file.handle = h;
+ el[0].flags = SMB2_LOCK_FLAG_UNLOCK;
+ status = smb2_lock(tree, &lck);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ done:
+ smb2_util_close(tree, h);
+ smb2_util_unlink(tree, fname);
+ talloc_free(tree);
+
+ return ret;
+}
+
/*
Open, take BRL, disconnect, reconnect.
*/
-bool test_durable_open_lock(struct torture_context *tctx,
- struct smb2_tree *tree)
+bool test_durable_open_lock_lease(struct torture_context *tctx,
+ struct smb2_tree *tree)
{
TALLOC_CTX *mem_ctx = talloc_new(tctx);
struct smb2_create io;
char fname[256];
bool ret = true;
uint64_t lease;
+ uint32_t caps;
+
+ caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
+ if (!(caps & SMB2_CAP_LEASING)) {
+ torture_skip(tctx, "leases are not supported");
+ }
/*
* Choose a random name and random lease in case the state is left a
* little funky.
*/
lease = random();
- snprintf(fname, 256, "durable_open_lock_%s.dat", generate_random_str(tctx, 8));
+ snprintf(fname, 256, "durable_open_lease_lock_%s.dat", generate_random_str(tctx, 8));
/* Clean slate */
smb2_util_unlink(tree, fname);
return ret;
}
-/*
- Open, disconnect, open in another tree, reconnect.
-
- This test actually demonstrates a minimum level of respect for the durable
- open in the face of another open. As long as this test shows an inability to
- reconnect after an open, the oplock/lease tests above will certainly
- demonstrate an error on reconnect.
-*/
-bool test_durable_open_open(struct torture_context *tctx,
- struct smb2_tree *tree1,
- struct smb2_tree *tree2)
+/**
+ * Open with a RH lease, disconnect, open in another tree, reconnect.
+ *
+ * This test actually demonstrates a minimum level of respect for the durable
+ * open in the face of another open. As long as this test shows an inability to
+ * reconnect after an open, the oplock/lease tests above will certainly
+ * demonstrate an error on reconnect.
+ */
+bool test_durable_open_open2_lease(struct torture_context *tctx,
+ struct smb2_tree *tree1,
+ struct smb2_tree *tree2)
{
TALLOC_CTX *mem_ctx = talloc_new(tctx);
struct smb2_create io1, io2;
char fname[256];
bool ret = true;
uint64_t lease;
+ uint32_t caps;
+
+ caps = smb2cli_conn_server_capabilities(tree1->session->transport->conn);
+ if (!(caps & SMB2_CAP_LEASING)) {
+ torture_skip(tctx, "leases are not supported");
+ }
/*
* Choose a random name and random lease in case the state is left a
* little funky.
*/
lease = random();
- snprintf(fname, 256, "durable_open_open_%s.dat", generate_random_str(tctx, 8));
+ snprintf(fname, 256, "durable_open_open2_lease_%s.dat",
+ generate_random_str(tctx, 8));
/* Clean slate */
smb2_util_unlink(tree1, fname);
return ret;
}
+/**
+ * Open with a batch oplock, disconnect, open in another tree, reconnect.
+ *
+ * This test actually demonstrates a minimum level of respect for the durable
+ * open in the face of another open. As long as this test shows an inability to
+ * reconnect after an open, the oplock/lease tests above will certainly
+ * demonstrate an error on reconnect.
+ */
+bool test_durable_open_open2_oplock(struct torture_context *tctx,
+ struct smb2_tree *tree1,
+ struct smb2_tree *tree2)
+{
+ TALLOC_CTX *mem_ctx = talloc_new(tctx);
+ struct smb2_create io1, io2;
+ struct smb2_handle h1, h2;
+ NTSTATUS status;
+ char fname[256];
+ bool ret = true;
+
+ /*
+ * Choose a random name and random lease in case the state is left a
+ * little funky.
+ */
+ snprintf(fname, 256, "durable_open_open2_oplock_%s.dat",
+ generate_random_str(tctx, 8));
+
+ /* Clean slate */
+ smb2_util_unlink(tree1, fname);
+
+ /* Create with batch oplock */
+ smb2_oplock_create(&io1, fname, SMB2_OPLOCK_LEVEL_BATCH);
+ io1.in.durable_open = true;
+
+ status = smb2_create(tree1, mem_ctx, &io1);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ h1 = io1.out.file.handle;
+ CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+ CHECK_VAL(io1.out.durable_open, true);
+ CHECK_VAL(io1.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
+
+ /* Disconnect */
+ talloc_free(tree1);
+ tree1 = NULL;
+
+ /* Open the file in tree2 */
+ smb2_oplock_create(&io2, fname, SMB2_OPLOCK_LEVEL_NONE);
+
+ status = smb2_create(tree2, mem_ctx, &io2);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ h2 = io2.out.file.handle;
+ CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+
+ /* Reconnect */
+ if (!torture_smb2_connection(tctx, &tree1)) {
+ torture_warning(tctx, "couldn't reconnect, bailing\n");
+ ret = false;
+ goto done;
+ }
+
+ ZERO_STRUCT(io1);
+ io1.in.fname = fname;
+ io1.in.durable_handle = &h1;
+
+ status = smb2_create(tree1, mem_ctx, &io1);
+ CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+ h1 = io1.out.file.handle;
+
+ done:
+ smb2_util_close(tree2, h2);
+ smb2_util_unlink(tree2, fname);
+ smb2_util_close(tree1, h1);
+ smb2_util_unlink(tree1, fname);
+
+ talloc_free(tree1);
+ talloc_free(tree2);
+
+ return ret;
+}
+
struct torture_suite *torture_smb2_durable_open_init(void)
{
struct torture_suite *suite =
torture_suite_create(talloc_autofree_context(), "durable-open");
- torture_suite_add_1smb2_test(suite, "open1", test_durable_open_open1);
- torture_suite_add_1smb2_test(suite, "open2", test_durable_open_open2);
+ torture_suite_add_1smb2_test(suite, "open-oplock", test_durable_open_open_oplock);
+ torture_suite_add_1smb2_test(suite, "open-lease", test_durable_open_open_lease);
torture_suite_add_1smb2_test(suite, "reopen1", test_durable_open_reopen1);
torture_suite_add_1smb2_test(suite, "reopen2", test_durable_open_reopen2);
+ torture_suite_add_1smb2_test(suite, "reopen2a", test_durable_open_reopen2a);
torture_suite_add_1smb2_test(suite, "reopen3", test_durable_open_reopen3);
torture_suite_add_1smb2_test(suite, "reopen4", test_durable_open_reopen4);
+ torture_suite_add_1smb2_test(suite, "delete_on_close1",
+ test_durable_open_delete_on_close1);
torture_suite_add_2smb2_test(suite, "file-position",
test_durable_open_file_position);
torture_suite_add_2smb2_test(suite, "oplock", test_durable_open_oplock);
torture_suite_add_2smb2_test(suite, "lease", test_durable_open_lease);
- torture_suite_add_1smb2_test(suite, "lock", test_durable_open_lock);
- torture_suite_add_2smb2_test(suite, "open", test_durable_open_open);
+ torture_suite_add_1smb2_test(suite, "lock-oplock", test_durable_open_lock_oplock);
+ torture_suite_add_1smb2_test(suite, "lock-lease", test_durable_open_lock_lease);
+ torture_suite_add_2smb2_test(suite, "open2-lease",
+ test_durable_open_open2_lease);
+ torture_suite_add_2smb2_test(suite, "open2-oplock",
+ test_durable_open_open2_oplock);
suite->description = talloc_strdup(suite, "SMB2-DURABLE-OPEN tests");
git.samba.org / ddiss / samba.git / blobdiff