lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

fix up tests

Browse source
This commit is contained in:
Ariadne Conill 2020-07-20 08:24:31 -06:00
parent aa1cc0815c
commit 09057aa977
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/ifquery.c
View file

@ -234,6 +234,15 @@ main(int argc, char *argv[])
for (; idx < argc; idx++) for (; idx < argc; idx++)
{ {
struct lif_interface *iface = lif_state_lookup(&state, &collection, argv[idx]); struct lif_interface *iface = lif_state_lookup(&state, &collection, argv[idx]);
if (iface == NULL)
{
struct lif_dict_entry *entry = lif_dict_find(&collection, argv[idx]);
if (entry != NULL)
iface = entry->data;
}
if (iface == NULL) if (iface == NULL)
{ {
fprintf(stderr, "ifquery: unknown interface %s\n", argv[idx]); fprintf(stderr, "ifquery: unknown interface %s\n", argv[idx]);

12
tests/ifquery_test
View file

@ -11,12 +11,12 @@ tests_init \
dhcp_ipv4 dhcp_ipv4
noargs_body() { noargs_body() {
atf_check -s exit:1 -e ignore ifquery atf_check -s exit:1 -e ignore ifquery -S/dev/null
} }
loopback_always_configured_body() { loopback_always_configured_body() {
atf_check -s exit:0 -o match:"inet loopback" \ atf_check -s exit:0 -o match:"inet loopback" \
ifquery -i $FIXTURES/static-eth0.interfaces lo ifquery -S/dev/null -i $FIXTURES/static-eth0.interfaces lo
} }
static_dual_stack_body() { static_dual_stack_body() {
@ -24,22 +24,22 @@ static_dual_stack_body() {
-o match:"address 2001:db8:1000:2::2/64" \ -o match:"address 2001:db8:1000:2::2/64" \
-o match:"gateway 203.0.113.1" \ -o match:"gateway 203.0.113.1" \
-o match:"gateway 2001:db8:1000:2::1" \ -o match:"gateway 2001:db8:1000:2::1" \
ifquery -i $FIXTURES/static-eth0.interfaces eth0 ifquery -S/dev/null -i $FIXTURES/static-eth0.interfaces eth0
} }
static_ipv4_body() { static_ipv4_body() {
atf_check -s exit:0 -o match:"address 203.0.113.2/24" \ atf_check -s exit:0 -o match:"address 203.0.113.2/24" \
-o match:"gateway 203.0.113.1" \ -o match:"gateway 203.0.113.1" \
ifquery -i $FIXTURES/static-eth0-v4.interfaces eth0 ifquery -S/dev/null -i $FIXTURES/static-eth0-v4.interfaces eth0
} }
static_ipv6_body() { static_ipv6_body() {
atf_check -s exit:0 -o match:"address 2001:db8:1000:2::2/64" \ atf_check -s exit:0 -o match:"address 2001:db8:1000:2::2/64" \
-o match:"gateway 2001:db8:1000:2::1" \ -o match:"gateway 2001:db8:1000:2::1" \
ifquery -i $FIXTURES/static-eth0-v6.interfaces eth0 ifquery -S/dev/null -i $FIXTURES/static-eth0-v6.interfaces eth0
} }
dhcp_ipv4_body() { dhcp_ipv4_body() {
atf_check -s exit:0 -o match:"inet dhcp" \ atf_check -s exit:0 -o match:"inet dhcp" \
ifquery -i $FIXTURES/dhcp-eth0.interfaces eth0 ifquery -S/dev/null -i $FIXTURES/dhcp-eth0.interfaces eth0
} }