From: Swen Schillig <swen@linux.ibm.com>
Date: Mon, 18 Mar 2019 14:15:25 +0000 (+0100)
Subject: ctdb-test: Modify ctdb_io_test test_setup to provide queue reference
X-Git-Tag: tdb-1.4.1~477
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c1009b3191cb9ecfd879d824e7ffee4283d9105;p=thirdparty%2Fsamba.git

ctdb-test: Modify ctdb_io_test test_setup to provide queue reference

Some test scenarios require access to the created queue.
Prepare the test_setup function to provide it as additional parameter.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Christof Schmitt <cs@samba.org>
---

diff --git a/ctdb/tests/src/ctdb_io_test.c b/ctdb/tests/src/ctdb_io_test.c
index 5a2f81538a1..668b1f0afe5 100644
--- a/ctdb/tests/src/ctdb_io_test.c
+++ b/ctdb/tests/src/ctdb_io_test.c
@@ -34,7 +34,8 @@ void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...)
 
 static void test_setup(ctdb_queue_cb_fn_t cb,
 		       int *pfd,
-		       struct ctdb_context **pctdb)
+		       struct ctdb_context **pctdb,
+		       struct ctdb_queue **pqueue)
 {
 	int pipefd[2], ret;
 	struct ctdb_context *ctdb;
@@ -54,6 +55,9 @@ static void test_setup(ctdb_queue_cb_fn_t cb,
 
 	*pctdb = ctdb;
 	*pfd = pipefd[1];
+	if (pqueue != NULL) {
+		*pqueue = queue;
+	}
 }
 
 static const size_t test1_req_len = 8;
@@ -76,7 +80,7 @@ static void test1(void)
 	int fd, ret;
 	uint32_t pkt_size;
 
-	test_setup(test1_callback, &fd, &ctdb);
+	test_setup(test1_callback, &fd, &ctdb, NULL);
 
 	pkt_size = sizeof(uint32_t) + test1_req_len;
 	ret = write(fd, &pkt_size, sizeof(pkt_size));
@@ -116,7 +120,7 @@ static void test2(void)
 		req[i] = i % CHAR_MAX;
 	}
 
-	test_setup(test2_callback, &fd, &ctdb);
+	test_setup(test2_callback, &fd, &ctdb, NULL);
 
 	/*
 	 * request 0