diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-06 00:47:13 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-06 00:47:13 +0200 |
| commit | 45bb35bff2a8d258aff2c1d9b68cce1787c7da62 (patch) | |
| tree | e9da08b1d189befb839889185b4f3304d389a60f /src/devices/tests/test-lldp.c | |
| parent | d101696d539cd03172badbcde19e9a13e5707ee1 (diff) | |
| parent | 2bfb3eb7d0323e69affca154395f51d8b577414d (diff) | |
Merge tag 'upstream/1.1.93'
Upstream version 1.1.93
Diffstat (limited to 'src/devices/tests/test-lldp.c')
| -rw-r--r-- | src/devices/tests/test-lldp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 85c3b510..1b7f536d 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -29,8 +29,7 @@ #include "nm-lldp-listener.h" #include "nm-sd.h" -#include "nm-sd-adapt.h" -#include "lldp.h" +#include "sd-lldp.h" #include "test-common.h" @@ -147,8 +146,8 @@ _test_recv_data0_check (GMainLoop *loop, NMLldpListener *listener) g_assert_cmpint (g_variant_n_children (neighbors), ==, 1); neighbor = get_lldp_neighbor (neighbors, - LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:02:03:04:05", - LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/3"); + SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:02:03:04:05", + SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/3"); g_assert (neighbor); g_assert_cmpint (g_variant_n_children (neighbor), ==, 4 + 4); @@ -244,8 +243,8 @@ _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) g_assert_cmpint (g_variant_n_children (neighbors), ==, 1); neighbor = get_lldp_neighbor (neighbors, - LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:30:F9:AD:A0", - LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/1"); + SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:30:F9:AD:A0", + SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/1"); g_assert (neighbor); g_assert_cmpint (g_variant_n_children (neighbor), ==, 4 + 10); |