From 45082a88c7aaaa928ca36003ade071aafe4de54d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 18 May 2012 15:43:31 +1000 Subject: s4-torture: Improve torture test boilerplate, use torture_assert() This ensures that if this fails, it is reported as a subunit error correctly. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Fri May 18 09:35:13 CEST 2012 on sn-devel-104 --- source4/torture/basic/delaywrite.c | 64 ++++++++++---------------------------- source4/torture/basic/disconnect.c | 4 +-- source4/torture/basic/locking.c | 4 +-- 3 files changed, 18 insertions(+), 54 deletions(-) (limited to 'source4/torture/basic') diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 939827ec3c..15482d8bc0 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -54,9 +54,7 @@ static bool test_delayed_write_update(struct torture_context *tctx, struct smbcl torture_comment(tctx, "\nRunning test_delayed_write_update\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -148,9 +146,7 @@ static bool test_delayed_write_update1(struct torture_context *tctx, struct smbc torture_comment(tctx, "\nRunning test_delayed_write_update1\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -339,9 +335,7 @@ static bool test_delayed_write_update1a(struct torture_context *tctx, struct smb torture_comment(tctx, "\nRunning test_delayed_write_update1a\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -521,9 +515,7 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb torture_comment(tctx, "\nRunning test_delayed_write_update1b\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -696,9 +688,7 @@ static bool test_delayed_write_update1c(struct torture_context *tctx, struct smb torture_comment(tctx, "\nRunning test_delayed_write_update1c\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -878,9 +868,7 @@ static bool test_delayed_write_update2(struct torture_context *tctx, struct smbc torture_comment(tctx, "\nRunning test_delayed_write_update2\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -1237,9 +1225,7 @@ static bool test_finfo_after_write(struct torture_context *tctx, struct smbcli_s torture_comment(tctx, "\nRunning test_finfo_after_write\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { @@ -1511,9 +1497,7 @@ static bool test_delayed_write_update3(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update3\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -1665,9 +1649,7 @@ static bool test_delayed_write_update3a(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update3a\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -1878,9 +1860,7 @@ static bool test_delayed_write_update3b(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update3b\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -2044,9 +2024,7 @@ static bool test_delayed_write_update3c(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update3c\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -2254,9 +2232,7 @@ static bool test_delayed_write_update4(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update4\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -2413,9 +2389,7 @@ static bool test_delayed_write_update5(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update5\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -2575,9 +2549,7 @@ static bool test_delayed_write_update5b(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update5b\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -2743,9 +2715,7 @@ static bool test_delayed_write_update6(struct torture_context *tctx, torture_comment(tctx, "\nRunning test_delayed_write_update6\n"); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); again: torture_comment(tctx, "Open the file handle\n"); fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -3001,9 +2971,7 @@ static bool test_delayed_write_update7(struct torture_context *tctx, struct smbc ZERO_STRUCT(finfo3); ZERO_STRUCT(open_parms); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); /* Create the file. */ fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c index 17fbc61d2f..7fb87d81fc 100644 --- a/source4/torture/basic/disconnect.c +++ b/source4/torture/basic/disconnect.c @@ -151,9 +151,7 @@ bool torture_disconnect(struct torture_context *torture) return false; } - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(torture, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); for (i=0;i