picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7484 from poettering/sd-resolve-timeout

Browse source 
timeout sd-resolve tests
This commit is contained in:
Lennart Poettering 2017-11-28 11:33:38 +01:00 committed by GitHub
parent edb5318cbc 5bf5510b8f
commit c9f034a10a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/basic/io-util.c
View file

@ -200,7 +200,6 @@ int fd_wait_for_event(int fd, int event, usec_t t) {
r = ppoll(&pollfd, 1, t == USEC_INFINITY ? NULL : timespec_store(&ts, t), NULL);
if (r < 0)
return -errno;
if (r == 0)
return 0;

2
src/libsystemd/sd-resolve/sd-resolve.c
View file

@ -890,6 +890,8 @@ _public_ int sd_resolve_wait(sd_resolve *resolve, uint64_t timeout_usec) {
if (r < 0)
return r;
if (r == 0)
return -ETIMEDOUT;
return sd_resolve_process(resolve);
}

13
src/libsystemd/sd-resolve/test-resolve.c
View file

@ -34,6 +34,8 @@
#include "socket-util.h"
#include "string-util.h"
#define TEST_TIMEOUT_USEC (20*USEC_PER_SEC)
static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) {
const struct addrinfo *i;
@ -102,9 +104,18 @@ int main(int argc, char *argv[]) {
/* Wait until all queries are completed */
for (;;) {
r = sd_resolve_wait(resolve, (uint64_t) -1);
r = sd_resolve_wait(resolve, TEST_TIMEOUT_USEC);
if (r == 0)
break;
if (r == -ETIMEDOUT) {
/* Let's catch time-outs here, so that we can run safely in a CI that has no reliable DNS. Note
* that we invoke exit() directly here, as the stuck NSS call will not allow us to exit
* cleanly. */
log_notice_errno(r, "sd_resolve_wait() timed out, but that's OK");
exit(EXIT_SUCCESS);
break;
}
if (r < 0) {
log_error_errno(r, "sd_resolve_wait(): %m");
assert_not_reached("sd_resolve_wait() failed");