test: Fix pool test

uv_run will not terminate until we call pool_fini, since the pool's async handle will be active. Signed-off-by: Cole Miller <[email protected]>
canonical · Aug 16, 2024 · 44ffe40 · 44ffe40
1 parent ab75812
commit 44ffe40
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/test/unit/ext/test_uv_pool.c b/test/unit/ext/test_uv_pool.c
@@ -25,9 +25,6 @@ static void loop_setup(struct fixture *f)
 
 	rc = uv_loop_init(&f->loop);
 	munit_assert_int(rc, ==, 0);
-
-	rc = pool_init(&f->pool, &f->loop, 4, POOL_QOS_PRIO_FAIR);
-	munit_assert_int(rc, ==, 0);
 }
 
 static void bottom_work_cb(pool_work_t *w)
@@ -39,8 +36,10 @@ static void bottom_after_work_cb(pool_work_t *w)
 {
 	static int count = 0;
 
-	if (count == WORK_ITEMS_NR)
+	if (count == WORK_ITEMS_NR) {
 		pool_close(w->pool);
+		pool_fini(w->pool);
+	}
 
 	count++;
 	assert(w->type != WT_BAR);
@@ -80,7 +79,6 @@ static void threadpool_tear_down(void *data)
 	int rc;
 	struct fixture *f = data;
 
-	pool_fini(&f->pool);
 	rc = uv_loop_close(&f->loop);
 	munit_assert_int(rc, ==, 0);
 	free(f);
@@ -104,6 +102,9 @@ TEST_CASE(threadpool, sync, NULL)
 	struct fixture *f = data;
 	int rc;
 
+	rc = pool_init(&f->pool, &f->loop, 4, POOL_QOS_PRIO_FAIR);
+	munit_assert_int(rc, ==, 0);
+
 	pool_queue_work(&f->pool, &f->w, 0, WT_UNORD, work_cb, after_work_cb);
 
 	rc = uv_run(&f->loop, UV_RUN_DEFAULT);