Commit bc90cf0d authored by Vincent Wan's avatar Vincent Wan Committed by Jukka Rissanen
Browse files

tests: lib: fdtable: fix tests after modifying reference counting 



Tests need to be adjusted to do the correct checks now that reference
count is incremented in z_reserve_fd() instead of z_finalize_fd().

test_z_fd_multiple_access in particular has been simplified to
reserving an fd in one thread and freeing it in the other.

Signed-off-by: default avatarVincent Wan <vwan@ti.com>
parent 0e436ed7

tests/lib/fdtable/src/main.c

+3 −12
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ void test_z_get_fd_obj(void) 


	/* take branch -- if (_check_fd(fd) < 0) */

	zassert_is_null(obj, "obj not is NULL");

	zassert_equal(errno, EBADF, "errno not set");



	obj = (void *)1;

	vtable = (const struct fd_op_vtable *)1;
@@ -142,14 +141,11 @@ static void test_cb(void *fd_ptr) 
	zassert_not_null(obj, "obj is null");

	zassert_not_null(vtable, "vtable is null");



	/* This is very much artificial and only meaningful in this test. */

	z_finalize_fd(fd, obj, vtable);



	/* The object should not be null after the free as ref count is 1 */

	z_free_fd(fd);



	obj = z_get_fd_obj_and_vtable(fd, &vtable);

	zassert_not_null(obj, "obj is null");

	zassert_is_null(obj, "obj is still there");

	zassert_equal(errno, EBADF, "fd was found");

}



void test_z_fd_multiple_access(void)
@@ -170,12 +166,7 @@ void test_z_fd_multiple_access(void) 


	k_thread_join(&fd_thread, K_FOREVER);



	obj = z_get_fd_obj_and_vtable(shared_fd, &vtable);

	zassert_not_null(obj, "obj disappeared");

	zassert_not_null(vtable, "vtable disappeared");



	z_free_fd(shared_fd);



	/* should be null since freed in the other thread */

	obj = z_get_fd_obj_and_vtable(shared_fd, &vtable);

	zassert_is_null(obj, "obj is still there");

	zassert_equal(errno, EBADF, "fd was found");

CRA Git | Maintained and supported by SUSTech CRA and CCSE