summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2012-02-28 12:54:35 +0100
committerStefan Metzmacher <metze@samba.org>2012-03-06 23:53:06 +0100
commitdc44cbfb1aed3dd375ccdad2ba701fc817c4d0b0 (patch)
tree0529ec22c868bcb3d2e199a52c5eeb4d11abd933 /source4
parentb80e95633ea4046108fd3941500d317028eb0e39 (diff)
downloadsamba-dc44cbfb1aed3dd375ccdad2ba701fc817c4d0b0.tar.gz
samba-dc44cbfb1aed3dd375ccdad2ba701fc817c4d0b0.tar.bz2
samba-dc44cbfb1aed3dd375ccdad2ba701fc817c4d0b0.zip
s4:torture: avoid reporting error on failure of smb2.streams tests
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/smb2/streams.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c
index a679ee2e5c..8e7fb220c8 100644
--- a/source4/torture/smb2/streams.c
+++ b/source4/torture/smb2/streams.c
@@ -72,11 +72,12 @@
ok = false; \
} \
if (!ok) { \
- torture_comment(tctx,"(%s) Incorrect value %s='%s' - " \
- "should be '%s'\n", \
- __location__, #v, (v)?(v):"NULL", \
- (correct)?(correct):"NULL"); \
- ret = false; \
+ torture_result(tctx, TORTURE_FAIL, \
+ "(%s) Incorrect value %s='%s' - " \
+ "should be '%s'\n", \
+ __location__, #v, (v)?(v):"NULL", \
+ (correct)?(correct):"NULL"); \
+ ret = false; \
}} while (0)
@@ -1128,17 +1129,19 @@ done:
sfinfo.generic.in.file.handle = h1; \
status = smb2_setinfo_file(tree, &sfinfo); \
if (!NT_STATUS_EQUAL(status, rightstatus)) { \
- torture_comment(tctx,"(%s) %s - %s (should be %s)\n", \
- __location__, #call, \
- nt_errstr(status), nt_errstr(rightstatus)); \
- ret = false; \
+ torture_result(tctx, TORTURE_FAIL, \
+ "(%s) %s - %s (should be %s)\n", \
+ __location__, #call, \
+ nt_errstr(status), nt_errstr(rightstatus)); \
+ ret = false; \
} \
finfo1.generic.level = RAW_FILEINFO_ALL_INFORMATION; \
finfo1.generic.in.file.handle = h1; \
status2 = smb2_getinfo_file(tree, tctx, &finfo1); \
if (!NT_STATUS_IS_OK(status2)) { \
- torture_comment(tctx,"(%s) %s pathinfo - %s\n", \
- __location__, #call, nt_errstr(status)); \
+ torture_result(tctx, TORTURE_FAIL, \
+ "(%s) %s pathinfo - %s\n", \
+ __location__, #call, nt_errstr(status)); \
ret = false; \
}} while (0)