sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r20823: Remove newlines in calls to torture_fail().

Browse Source 
(This used to be commit 37c0cfe83b)
This commit is contained in:
Jelmer Vernooij 2007-01-16 01:36:15 +00:00 committed by Gerald (Jerry) Carter
parent 6688846ee1
commit 6967a73f36
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/torture/basic/base.c
View File

@ -93,7 +93,7 @@ static BOOL tcon_devtest(struct torture_context *tctx,
if (status) {
torture_fail(tctx, talloc_asprintf(tctx,
"tconx to share %s with type %s "
"should have failed but succeeded\n",
"should have failed but succeeded",
myshare, devtype));
} else {
if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),
@ -725,7 +725,7 @@ static BOOL run_vuidtest(struct torture_context *tctx,
NT_STATUS_INVALID_HANDLE)) {
torture_fail(tctx, talloc_asprintf(tctx,
"qfileinfo should have returned DOS error "
"ERRSRV:ERRbaduid\n but returned %s\n",
"ERRSRV:ERRbaduid\n but returned %s",
smbcli_errstr(cli->tree)));
}

10
source4/torture/local/dbspeed.c
View File

@ -63,7 +63,7 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data)
tdbw = tdb_wrap_open(tmp_ctx, "test.tdb",
10000, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
if (!tdbw) {
torture_fail(torture, "Failed to open test.tdb\n");
torture_fail(torture, "Failed to open test.tdb");
goto failed;
}
@ -171,7 +171,7 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data)
ldb = ldb_wrap_connect(tmp_ctx, "tdb://test.ldb",
NULL, NULL, LDB_FLG_NOSYNC, NULL);
if (!ldb) {
torture_fail(torture, "Failed to open test.ldb\n");
torture_fail(torture, "Failed to open test.ldb");
goto failed;
}
@ -207,20 +207,20 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data)
i = random() % torture_entries;
dn = ldb_dn_new_fmt(tmp_ctx, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", i);
if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != LDB_SUCCESS || res->count != 1) {
torture_fail(torture, talloc_asprintf(torture, "Failed to find SID %d\n", i));
torture_fail(torture, talloc_asprintf(torture, "Failed to find SID %d", i));
}
talloc_free(res);
talloc_free(dn);
expr = talloc_asprintf(tmp_ctx, "(UID=%u)", i);
if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) != LDB_SUCCESS || res->count != 1) {
torture_fail(torture, talloc_asprintf(torture, "Failed to find UID %d\n", i));
torture_fail(torture, talloc_asprintf(torture, "Failed to find UID %d", i));
}
talloc_free(res);
talloc_free(expr);
}
if (talloc_total_blocks(torture) > 100) {
torture_fail(torture, "memory leak in ldb search\n");
torture_fail(torture, "memory leak in ldb search");
goto failed;
}

2
source4/torture/local/iconv.c
View File

@ -133,7 +133,7 @@ static bool test_buffer(struct torture_context *test,
if (cd == (iconv_t)-1) {
torture_fail(test,
talloc_asprintf(test,
"failed to open %s to UTF-16LE\n",
"failed to open %s to UTF-16LE",
charset));
cd = NULL;
return false;