diff options
author | Michael Adam <obnox@samba.org> | 2014-10-02 16:40:26 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-03 08:34:06 +0200 |
commit | dbb3a546a5cc7919c08782489b5a1b24a4a22c53 (patch) | |
tree | 38750d6be9a7db5cd8931e6b9f0fc9dc474db9a6 | |
parent | c0cbad78923f72b3d7991e086f2455e276bd0cb0 (diff) | |
download | samba-dbb3a546a5cc7919c08782489b5a1b24a4a22c53.tar.gz |
s4:torture:basic: make use of torture_assert macros in delayed_write_update1b
This does not change the logic except for adding early
returns in failure cases.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r-- | source4/torture/basic/delaywrite.c | 65 |
1 files changed, 24 insertions, 41 deletions
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index c28dfa9e396..7f5828428f6 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -462,10 +462,8 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb 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) { - torture_result(tctx, TORTURE_FAIL, "Failed to open %s", fname); - return false; - } + torture_assert_int_not_equal(tctx, fnum1, -1, talloc_asprintf(tctx, + "Failed to open %s", fname)); memset(buf, 'x', 2048); written = smbcli_write(cli->tree, fnum1, 0, buf, 0, 2048); @@ -498,19 +496,11 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb while (!timeval_expired(&end)) { status = smb_raw_fileinfo(cli->tree, tctx, &finfo2); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(0, ("fileinfo failed: %s\n", nt_errstr(status))); - ret = false; - break; - } + torture_assert_ntstatus_ok(tctx, status, "fileinfo failed"); - if (finfo2.all_info.out.size != 10240) { - torture_result(tctx, TORTURE_FAIL, - "file not truncated (size = %u, should be 10240)", - (unsigned int)finfo2.all_info.out.size ); - ret = false; - break; - } + torture_assert_u64_equal(tctx, finfo2.all_info.out.size, 10240, + "file not truncated to expected size " + "(10240)"); torture_comment(tctx, "write time %s\n", nt_time_string(tctx, finfo2.all_info.out.write_time)); @@ -536,11 +526,10 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb smb_msleep(1 * msec); } - if (finfo1.all_info.out.write_time == finfo2.all_info.out.write_time) { - torture_result(tctx, TORTURE_FAIL, - "Server did not update write time (wrong!)"); - ret = false; - } + torture_assert_u64_not_equal(tctx, + finfo2.all_info.out.write_time, + finfo1.all_info.out.write_time, + "Server did not update write time"); fflush(stdout); smb_msleep(2 * msec); @@ -556,19 +545,11 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb while (!timeval_expired(&end)) { status = smb_raw_fileinfo(cli->tree, tctx, &finfo3); - if (!NT_STATUS_IS_OK(status)) { - torture_result(tctx, TORTURE_FAIL, - "fileinfo failed: %s", nt_errstr(status)); - ret = false; - break; - } + torture_assert_ntstatus_ok(tctx, status, "fileinfo failed"); - if (finfo3.all_info.out.size != 10240) { - DEBUG(0, ("file not truncated (size = %u, should be 10240)\n", - (unsigned int)finfo3.all_info.out.size )); - ret = false; - break; - } + torture_assert_u64_equal(tctx, finfo3.all_info.out.size, 10240, + "file not truncated to expected size " + "(10240)"); torture_comment(tctx, "write time %s\n", nt_time_string(tctx, finfo3.all_info.out.write_time)); @@ -584,10 +565,10 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb smb_msleep(1 * msec); } - if (finfo2.all_info.out.write_time != finfo3.all_info.out.write_time) { - torture_result(tctx, TORTURE_FAIL, "Server updated write time (wrong!)\n"); - ret = false; - } + torture_assert_u64_equal(tctx, + finfo3.all_info.out.write_time, + finfo2.all_info.out.write_time, + "Server updated write time"); /* the close should trigger an write time update */ smbcli_close(cli->tree, fnum1); @@ -596,10 +577,12 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb status = smb_raw_pathinfo(cli->tree, tctx, &pinfo4); torture_assert_ntstatus_ok(tctx, status, "pathinfo failed"); - if (finfo3.all_info.out.write_time == pinfo4.all_info.out.write_time) { - torture_result(tctx, TORTURE_FAIL, "Server did not update write time on close (wrong!)\n"); - ret = false; - } else if (finfo3.all_info.out.write_time < pinfo4.all_info.out.write_time) { + torture_assert_u64_not_equal(tctx, + pinfo4.all_info.out.write_time, + finfo3.all_info.out.write_time, + "Server did not update write time on " + "close (wrong!)"); + if (finfo3.all_info.out.write_time < pinfo4.all_info.out.write_time) { torture_comment(tctx, "Server updated write time on close (correct)\n"); } |