test: use _cleanup_ for temp. files
This commit is contained in:
+9
-24
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "fd-util.h"
|
||||
#include "fdset.h"
|
||||
#include "fs-util.h"
|
||||
#include "macro.h"
|
||||
#include "tests.h"
|
||||
#include "tmpfile-util.h"
|
||||
@@ -12,21 +13,19 @@
|
||||
TEST(fdset_new_fill) {
|
||||
int fd = -EBADF;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
char name[] = "/tmp/test-fdset_new_fill.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_new_fill.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
assert_se(fdset_new_fill(&fdset) >= 0);
|
||||
assert_se(fdset_contains(fdset, fd));
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_put_dup) {
|
||||
_cleanup_close_ int fd = -EBADF;
|
||||
int copyfd = -EBADF;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
char name[] = "/tmp/test-fdset_put_dup.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_put_dup.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
@@ -37,15 +36,13 @@ TEST(fdset_put_dup) {
|
||||
assert_se(copyfd >= 0 && copyfd != fd);
|
||||
assert_se(fdset_contains(fdset, copyfd));
|
||||
assert_se(!fdset_contains(fdset, fd));
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_cloexec) {
|
||||
int fd = -EBADF;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
int flags = -1;
|
||||
char name[] = "/tmp/test-fdset_cloexec.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_cloexec.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
@@ -63,8 +60,6 @@ TEST(fdset_cloexec) {
|
||||
flags = fcntl(fd, F_GETFD);
|
||||
assert_se(flags >= 0);
|
||||
assert_se(flags & FD_CLOEXEC);
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_close_others) {
|
||||
@@ -72,7 +67,7 @@ TEST(fdset_close_others) {
|
||||
int copyfd = -EBADF;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
int flags = -1;
|
||||
char name[] = "/tmp/test-fdset_close_others.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_close_others.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
@@ -87,14 +82,12 @@ TEST(fdset_close_others) {
|
||||
assert_se(flags < 0);
|
||||
flags = fcntl(copyfd, F_GETFD);
|
||||
assert_se(flags >= 0);
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_remove) {
|
||||
_cleanup_close_ int fd = -EBADF;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
char name[] = "/tmp/test-fdset_remove.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_remove.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
@@ -106,14 +99,12 @@ TEST(fdset_remove) {
|
||||
assert_se(!fdset_contains(fdset, fd));
|
||||
|
||||
assert_se(fcntl(fd, F_GETFD) >= 0);
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_iterate) {
|
||||
int fd = -EBADF;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
char name[] = "/tmp/test-fdset_iterate.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_iterate.XXXXXX";
|
||||
int c = 0;
|
||||
int a;
|
||||
|
||||
@@ -131,14 +122,12 @@ TEST(fdset_iterate) {
|
||||
assert_se(a == fd);
|
||||
}
|
||||
assert_se(c == 1);
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_isempty) {
|
||||
int fd;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
char name[] = "/tmp/test-fdset_isempty.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_isempty.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
@@ -149,14 +138,12 @@ TEST(fdset_isempty) {
|
||||
assert_se(fdset_isempty(fdset));
|
||||
assert_se(fdset_put(fdset, fd) >= 0);
|
||||
assert_se(!fdset_isempty(fdset));
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_steal_first) {
|
||||
int fd;
|
||||
_cleanup_fdset_free_ FDSet *fdset = NULL;
|
||||
char name[] = "/tmp/test-fdset_steal_first.XXXXXX";
|
||||
_cleanup_(unlink_tempfilep) char name[] = "/tmp/test-fdset_steal_first.XXXXXX";
|
||||
|
||||
fd = mkostemp_safe(name);
|
||||
assert_se(fd >= 0);
|
||||
@@ -169,8 +156,6 @@ TEST(fdset_steal_first) {
|
||||
assert_se(fdset_steal_first(fdset) == fd);
|
||||
assert_se(fdset_steal_first(fdset) < 0);
|
||||
assert_se(fdset_put(fdset, fd) >= 0);
|
||||
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
TEST(fdset_new_array) {
|
||||
|
||||
Reference in New Issue
Block a user