summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-21 12:10:09 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-22 01:47:33 +0200
commit7d8db45028083f52341c05a9927d662fc2da7fe5 (patch)
tree10d68841e62a2fe2f11f75c8af399f4836789634 /source4
parent732f28b85e34cdba5cc6dd8df8e35b7132b3ac5c (diff)
downloadsamba-7d8db45028083f52341c05a9927d662fc2da7fe5.tar.gz
samba-7d8db45028083f52341c05a9927d662fc2da7fe5.tar.bz2
samba-7d8db45028083f52341c05a9927d662fc2da7fe5.zip
s4:torture/smb2: rename smb2.durable-open.lock to smb2.durable-open.lock-lease
metze
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/smb2/durable_open.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index 7e55052a05..e2f8d21db7 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -1109,8 +1109,8 @@ bool test_durable_open_lease(struct torture_context *tctx,
/*
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;
@@ -1134,7 +1134,7 @@ bool test_durable_open_lock(struct torture_context *tctx,
* 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);
@@ -1401,7 +1401,7 @@ struct torture_suite *torture_smb2_durable_open_init(void)
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_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",