X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Frun-die-during-transaction.c;h=ffb9fe4fbc8d8c942341f32fbbc4c79a6db3dde2;hp=d80527f51b0e2147100a7bc12df22ea6bfca12b5;hb=b3804e47471640f1f8c15f5013a78bdbeb12f69d;hpb=c4a9fd1b01822e75da853d3f3229de5d35409e31

diff --git a/ccan/tdb/test/run-die-during-transaction.c b/ccan/tdb/test/run-die-during-transaction.c
index d80527f5..ffb9fe4f 100644
--- a/ccan/tdb/test/run-die-during-transaction.c
+++ b/ccan/tdb/test/run-die-during-transaction.c
@@ -37,7 +37,7 @@ static bool in_transaction;
 static bool suppress_logging;
 static int target, current;
 static jmp_buf jmpbuf;
-#define TEST_DBNAME "/tmp/test7.tdb"
+#define TEST_DBNAME "run-die-during-transaction.tdb"
 
 static void taplog(struct tdb_context *tdb,
 		   enum tdb_debug_level level,
@@ -116,6 +116,7 @@ reset:
 	if (setjmp(jmpbuf) != 0) {
 		/* We're partway through.  Simulate our death. */
 		close(tdb->fd);
+		forget_locking();
 		in_transaction = false;
 
 		if (external_agent_operation(agent, NEEDS_RECOVERY_KEEP_OPENED,
@@ -144,11 +145,12 @@ reset:
 		external_agent_operation(agent, CLOSE, "");
 		/* Suppress logging as this tries to use closed fd. */
 		suppress_logging = true;
+		suppress_lockcheck = true;
 		tdb_close(tdb);
 		suppress_logging = false;
+		suppress_lockcheck = false;
 		target++;
 		current = 0;
-		forget_locking();
 		goto reset;
 	}
 
@@ -195,7 +197,7 @@ int main(int argc, char *argv[])
 	struct agent *agent;
 	int i;
 
-	plan_tests(6);
+	plan_tests(12);
 	unlock_callback = maybe_die;
 
 	agent = prepare_external_agent();