system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #33154 from yuwata/test-async

Browse source 
test-async: wait a while for fd to be closed
This commit is contained in:
Daan De Meyer 2024-06-02 08:49:44 +02:00 committed by GitHub
parent 9246d16d3d 94e8dd54d0
commit a173292ffa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/test/test-async.c
View file

@ -10,6 +10,7 @@
#include "path-util.h"
#include "process-util.h"
#include "signal-util.h"
#include "time-util.h"
#include "tests.h"
#include "tmpfile-util.h"
@ -17,6 +18,18 @@ TEST(asynchronous_sync) {
ASSERT_OK(asynchronous_sync(NULL));
}
static void wait_fd_closed(int fd) {
for (unsigned trial = 0; trial < 100; trial++) {
usleep_safe(100 * USEC_PER_MSEC);
if (fcntl(fd, F_GETFD) < 0) {
assert_se(errno == EBADF);
return;
}
}
assert_not_reached();
}
TEST(asynchronous_close) {
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-asynchronous_close.XXXXXX";
int fd, r;
@ -24,11 +37,7 @@ TEST(asynchronous_close) {
fd = mkostemp_safe(name);
ASSERT_OK(fd);
asynchronous_close(fd);
sleep(1);
ASSERT_EQ(fcntl(fd, F_GETFD), -1);
assert_se(errno == EBADF);
wait_fd_closed(fd);
r = safe_fork("(subreaper)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGKILL|FORK_LOG|FORK_WAIT, NULL);
ASSERT_OK(r);
@ -41,16 +50,24 @@ TEST(asynchronous_close) {
fd = open("/dev/null", O_RDONLY|O_CLOEXEC);
ASSERT_OK(fd);
asynchronous_close(fd);
sleep(1);
ASSERT_EQ(fcntl(fd, F_GETFD), -1);
assert_se(errno == EBADF);
wait_fd_closed(fd);
_exit(EXIT_SUCCESS);
}
}
static void wait_rm_rf(const char *path) {
for (unsigned trial = 0; trial < 100; trial++) {
usleep_safe(100 * USEC_PER_MSEC);
if (access(path, F_OK) < 0) {
assert_se(errno == ENOENT);
return;
}
}
assert_not_reached();
}
TEST(asynchronous_rm_rf) {
_cleanup_free_ char *t = NULL, *k = NULL;
int r;
@ -59,8 +76,9 @@ TEST(asynchronous_rm_rf) {
assert_se(k = path_join(t, "somefile"));
ASSERT_OK(touch(k));
ASSERT_OK(asynchronous_rm_rf(t, REMOVE_ROOT|REMOVE_PHYSICAL));
wait_rm_rf(t);
/* Do this once more, form a subreaper. Which is nice, because we can watch the async child even
/* Do this once more, from a subreaper. Which is nice, because we can watch the async child even
* though detached */
r = safe_fork("(subreaper)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_LOG|FORK_WAIT, NULL);