svn commit: samba r20823 - in branches/SAMBA_4_0/source/torture: basic local

[jelmer at samba.org]

Author: jelmer
Date: 2007-01-16 01:36:15 +0000 (Tue, 16 Jan 2007)
New Revision: 20823

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20823

Log:
Remove newlines in calls to torture_fail().
Modified:
   branches/SAMBA_4_0/source/torture/basic/base.c
   branches/SAMBA_4_0/source/torture/local/dbspeed.c
   branches/SAMBA_4_0/source/torture/local/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/base.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/base.c	2007-01-15 23:42:52 UTC (rev 20822)
+++ branches/SAMBA_4_0/source/torture/basic/base.c	2007-01-16 01:36:15 UTC (rev 20823)
@@ -93,7 +93,7 @@
 		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 @@
 			     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)));
 	}
 

Modified: branches/SAMBA_4_0/source/torture/local/dbspeed.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/dbspeed.c	2007-01-15 23:42:52 UTC (rev 20822)
+++ branches/SAMBA_4_0/source/torture/local/dbspeed.c	2007-01-16 01:36:15 UTC (rev 20823)
@@ -63,7 +63,7 @@
 	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 @@
 	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 @@
 		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;
 	}
 

Modified: branches/SAMBA_4_0/source/torture/local/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/iconv.c	2007-01-15 23:42:52 UTC (rev 20822)
+++ branches/SAMBA_4_0/source/torture/local/iconv.c	2007-01-16 01:36:15 UTC (rev 20823)
@@ -133,7 +133,7 @@
 		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;