sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

s4:torture:vfs_fruit: enhance check_stream

Browse Source 
Don't sleep when create fails and use torture_ macros.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11347

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit fdf937e77da29ec47002855db69d9e3f95005479)
This commit is contained in:
Ralph Boehme 2015-12-17 19:22:12 +01:00 committed by Karolin Seeger
parent eb5df33210
commit 86b653b19d
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source4/torture/vfs/fruit.c
View File

@ -900,7 +900,8 @@ static bool check_stream(struct smb2_tree *tree,
struct smb2_create create;
struct smb2_read r;
NTSTATUS status;
const char *full_name;
char *full_name;
bool ret = true;
full_name = talloc_asprintf(mem_ctx, "%s%s", fname, sname);
if (full_name == NULL) {
@ -917,22 +918,21 @@ static bool check_stream(struct smb2_tree *tree,
status = smb2_create(tree, mem_ctx, &create);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(full_name);
if (value == NULL) {
return true;
} else {
torture_comment(tctx, "Unable to open stream %s\n",
full_name);
sleep(10000000);
return false;
}
torture_comment(tctx, "Unable to open stream %s\n", full_name);
return false;
}
handle = create.out.file.handle;
if (value == NULL) {
TALLOC_FREE(full_name);
smb2_util_close(tree, handle);
return true;
}
ZERO_STRUCT(r);
r.in.file.handle = handle;
r.in.length = read_count;
@ -940,19 +940,24 @@ static bool check_stream(struct smb2_tree *tree,
status = smb2_read(tree, tree, &r);
if (!NT_STATUS_IS_OK(status)) {
torture_comment(tctx, "(%s) Failed to read %lu bytes from "
"stream '%s'\n", location, (long)strlen(value), full_name);
return false;
}
torture_assert_ntstatus_ok_goto(
tctx, status, ret, done,
talloc_asprintf(tctx, "(%s) Failed to read %lu bytes from stream '%s'\n",
location, (long)strlen(value), full_name));
if (memcmp(r.out.data.data + comp_offset, value, comp_count) != 0) {
torture_comment(tctx, "(%s) Bad data in stream\n", location);
return false;
}
torture_assert_goto(tctx, r.out.data.length == read_count, ret, done,
talloc_asprintf(tctx, "smb2_read returned %jd bytes, expected %jd\n",
(intmax_t)r.out.data.length, (intmax_t)read_count));
torture_assert_goto(
tctx, memcmp(r.out.data.data + comp_offset, value, comp_count) == 0,
ret, done,
talloc_asprintf(tctx, "(%s) Bad data in stream\n", location));
done:
TALLOC_FREE(full_name);
smb2_util_close(tree, handle);
return true;
return ret;
}
/**