From a9b31e68cfc8232e7e9aa60f70895f2ad0f245be Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 31 Oct 2011 23:54:06 +0100 Subject: s4:torture:smb2: rename the durable-open.basic1 test to durable-open.open1 for clarity --- source4/torture/smb2/durable_open.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'source4/torture/smb2') diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c index 33ce1e9cd3..6e62d4e36c 100644 --- a/source4/torture/smb2/durable_open.c +++ b/source4/torture/smb2/durable_open.c @@ -94,11 +94,11 @@ struct durable_open_vs_oplock durable_open_vs_oplock_table[NUM_OPLOCK_OPEN_TESTS { SMB2_OPLOCK_LEVEL_BATCH, true }, }; -static bool test_one_durable_open_basic1(struct torture_context *tctx, - struct smb2_tree *tree, - const char *fname, - struct smb2_create io, - struct durable_open_vs_oplock test) +static bool test_one_durable_open_open1(struct torture_context *tctx, + struct smb2_tree *tree, + const char *fname, + struct smb2_create io, + struct durable_open_vs_oplock test) { NTSTATUS status; TALLOC_CTX *mem_ctx = talloc_new(tctx); @@ -128,8 +128,8 @@ done: return ret; } -bool test_durable_open_basic1(struct torture_context *tctx, - struct smb2_tree *tree) +bool test_durable_open_open1(struct torture_context *tctx, + struct smb2_tree *tree) { TALLOC_CTX *mem_ctx = talloc_new(tctx); struct smb2_create io; @@ -138,7 +138,7 @@ bool test_durable_open_basic1(struct torture_context *tctx, int i; /* Choose a random name in case the state is left a little funky. */ - snprintf(fname, 256, "durable_open_basic1_%s.dat", generate_random_str(tctx, 8)); + snprintf(fname, 256, "durable_open_open1_%s.dat", generate_random_str(tctx, 8)); smb2_util_unlink(tree, fname); @@ -163,11 +163,11 @@ bool test_durable_open_basic1(struct torture_context *tctx, /* test various oplock levels with durable open */ for (i = 0; i < NUM_OPLOCK_OPEN_TESTS; i++) { - ret = test_one_durable_open_basic1(tctx, - tree, - fname, - io, - durable_open_vs_oplock_table[i]); + ret = test_one_durable_open_open1(tctx, + tree, + fname, + io, + durable_open_vs_oplock_table[i]); if (ret == false) { goto done; } @@ -867,7 +867,7 @@ 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, "basic1", test_durable_open_basic1); + torture_suite_add_1smb2_test(suite, "open1", test_durable_open_open1); torture_suite_add_1smb2_test(suite, "basic2", test_durable_open_basic2); torture_suite_add_2smb2_test(suite, "file-position", test_durable_open_file_position); -- cgit