Skip to content

Commit 8bc9741

Browse files
DaanDeMeyerbluca
authored andcommitted
test-dhcp-server: Gracefully handle the network being down
(cherry picked from commit 4cf7a67) (cherry picked from commit 2e52cf1) (cherry picked from commit db1d9bf) (cherry picked from commit 244ca2d)
1 parent ff09fe5 commit 8bc9741

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/libsystemd-network/test-dhcp-server.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ static void test_message_handler(void) {
119119
.s_addr = htobe32(INADDR_LOOPBACK + 42),
120120
};
121121
static uint8_t static_lease_client_id[7] = {0x01, 'A', 'B', 'C', 'D', 'E', 'G' };
122+
int r;
122123

123124
log_debug("/* %s */", __func__);
124125

@@ -129,7 +130,10 @@ static void test_message_handler(void) {
129130
assert_se(sd_dhcp_server_attach_event(server, NULL, 0) >= 0);
130131
assert_se(sd_dhcp_server_start(server) >= 0);
131132

132-
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == DHCP_OFFER);
133+
r = dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test));
134+
if (r == -ENETDOWN)
135+
return (void) log_tests_skipped("Network is not available");
136+
assert_se(r == DHCP_OFFER);
133137

134138
test.end = 0;
135139
/* TODO, shouldn't this fail? */

0 commit comments

Comments
 (0)