From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 18 May 2012 05:06:28 +0000 (+1000)
Subject: s4-torture: Always use torture_assert() to handle failures
X-Git-Tag: samba-4.0.0alpha21~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c52d1b8ac7d56eb728e4cc4ed2a560365d374b5;p=thirdparty%2Fsamba.git

s4-torture: Always use torture_assert() to handle failures
---

diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 5cd6937b77b..1c0a94e591e 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -45,9 +45,8 @@ static bool torture_locktest1(struct torture_context *tctx,
 	time_t t1, t2;
 	unsigned int lock_timeout;
 
-	if (!torture_setup_dir(cli1, BASEDIR)) {
-		return false;
-	}
+	torture_assert(tctx, torture_setup_dir(cli1, BASEDIR),
+		       talloc_asprintf(tctx, "Unable to set up %s", BASEDIR));
 
 	fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	torture_assert(tctx, fnum1 != -1,
@@ -163,9 +162,8 @@ static bool torture_locktest2(struct torture_context *tctx,
 	const char *fname = BASEDIR "\\lockt2.lck";
 	int fnum1, fnum2, fnum3;
 
-	if (!torture_setup_dir(cli, BASEDIR)) {
-		return false;
-	}
+	torture_assert(tctx, torture_setup_dir(cli, BASEDIR),
+		       talloc_asprintf(tctx, "Unable to set up %s", BASEDIR));
 
 	torture_comment(tctx, "Testing pid context\n");
 	
@@ -282,9 +280,8 @@ static bool torture_locktest3(struct torture_context *tctx,
 
 	torture_comment(tctx, "Testing 32 bit offset ranges");
 
-	if (!torture_setup_dir(cli1, BASEDIR)) {
-		return false;
-	}
+	torture_assert(tctx, torture_setup_dir(cli1, BASEDIR),
+		       talloc_asprintf(tctx, "Unable to set up %s", BASEDIR));
 
 	fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	torture_assert(tctx, fnum1 != -1,