_cleanup_free_ struct in6_addr *addresses6 = NULL;
struct in_addr a, b, c;
struct in6_addr d, e, f;
- size_t size;
+ int size;
const char *addresses_string = "192.168.0.1 0:0:0:0:0:FFFF:204.152.189.116 192.168.0.2 ::1 192.168.0.3 1:0:0:0:0:0:0:8";
assert_se(inet_pton(AF_INET, "0:0:0:0:0:FFFF:204.152.189.116", &a) == 0);
assert_se(inet_pton(AF_INET6, "::1", &e) == 1);
assert_se(inet_pton(AF_INET6, "1:0:0:0:0:0:0:8", &f) == 1);
- assert_se(deserialize_in_addrs(&addresses, &size, addresses_string) >= 0);
+ assert_se((size = deserialize_in_addrs(&addresses, addresses_string)) >= 0);
assert_se(size == 3);
assert_se(!memcmp(&a, &addresses[0], sizeof(struct in_addr)));
assert_se(!memcmp(&b, &addresses[1], sizeof(struct in_addr)));
assert_se(!memcmp(&c, &addresses[2], sizeof(struct in_addr)));
- assert_se(deserialize_in6_addrs(&addresses6, &size, addresses_string) >= 0);
+ assert_se((size = deserialize_in6_addrs(&addresses6, addresses_string)) >= 0);
assert_se(size == 3);
assert_se(!memcmp(&d, &addresses6[0], sizeof(struct in6_addr)));
assert_se(!memcmp(&e, &addresses6[1], sizeof(struct in6_addr)));
assert_se(routes[0].gw_addr.s_addr == inet_addr("192.168.0.1"));
assert_se(routes[0].dst_prefixlen == 16);
- assert_se(routes[2].dst_addr.s_addr == inet_addr("0.0.0.0"));
- assert_se(routes[2].gw_addr.s_addr == inet_addr("10.0.1.1"));
- assert_se(routes[2].dst_prefixlen == 0);
+ assert_se(routes[1].dst_addr.s_addr == inet_addr("0.0.0.0"));
+ assert_se(routes[1].gw_addr.s_addr == inet_addr("10.0.1.1"));
+ assert_se(routes[1].dst_prefixlen == 0);
}
{
}
}
-static void test_load_config(Manager *manager) {
+static int test_load_config(Manager *manager) {
+ int r;
/* TODO: should_reload, is false if the config dirs do not exist, so
* so we can't do this test here, move it to a test for paths_check_timestamps
* directly
*
* assert_se(network_should_reload(manager) == true);
*/
- assert_se(manager_load_config(manager) >= 0);
+
+ r = manager_load_config(manager);
+ if (r == -EPERM)
+ return r;
+ assert_se(r >= 0);
+
assert_se(manager_should_reload(manager) == false);
+
+ return 0;
}
static void test_network_get(Manager *manager, struct udev_device *loopback) {
_cleanup_manager_free_ Manager *manager = NULL;
struct udev *udev;
struct udev_device *loopback;
+ int r;
test_deserialize_in_addr();
test_deserialize_dhcp_routes();
assert_se(manager_new(&manager) >= 0);
- test_load_config(manager);
+ r = test_load_config(manager);
+ if (r == -EPERM)
+ return EXIT_TEST_SKIP;
udev = udev_new();
assert_se(udev);