SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16590 from keszybz/test-fs-util-relax

Browse Source 
Small adjustements to let various tests pass in overloaded Fedora infra and related changes
This commit is contained in:
Lennart Poettering
2020-07-29 15:54:51 +02:00
committed by GitHub
parent f8528230b3 c550cb7f8c
commit ee56c072b9
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/test-ndisc-rs.c
+5 -5
View File
@@ -217,7 +217,7 @@ static int send_ra(uint8_t flags) {
advertisement[5] = flags;
assert_se(write(test_fd[1], advertisement, sizeof(advertisement)) ==
sizeof(advertisement));
sizeof(advertisement));
if (verbose)
printf(" sent RA with flag 0x%02x\n", flags);
@@ -291,8 +291,8 @@ static void test_rs(void) {
assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0);
assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(),
time_now + 2 *USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
time_now + 30 * USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
assert_se(sd_ndisc_stop(nd) >= 0);
assert_se(sd_ndisc_start(nd) >= 0);
@@ -393,8 +393,8 @@ static void test_timeout(void) {
assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);
assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(),
time_now + 2U * USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
time_now + 30 * USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
assert_se(sd_ndisc_start(nd) >= 0);