X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Ftest-network.c;h=5e279974cb56b5daeb6e5a8255a625b903a106d8;hp=299f0fa3269de62efb9433d974e7352659dfd44e;hb=bc9fd78c7bfc39881e19457e476393635f8b0442;hpb=f579559b3a14c1f1ef96c372e7626c4733e6ef7d diff --git a/src/network/test-network.c b/src/network/test-network.c index 299f0fa32..5e279974c 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -23,7 +23,7 @@ static void test_link(struct udev_device *loopback) { _cleanup_manager_free_ Manager *manager = NULL; - _cleanup_link_free_ Link *link = NULL; + Link *link = NULL; manager_new(&manager); @@ -31,10 +31,15 @@ static void test_link(struct udev_device *loopback) { assert(link); } -static void test_network_load(Manager *manager) { - assert(network_should_reload(manager) == true); - assert(network_load(manager) >= 0); - assert(network_should_reload(manager) == false); +static void test_load_config(Manager *manager) { +/* 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(network_should_reload(manager) == true); +*/ + assert(manager_load_config(manager) >= 0); + assert(manager_should_reload(manager) == false); } static void test_network_get(Manager *manager, struct udev_device *loopback) { @@ -53,7 +58,7 @@ int main(void) { assert(manager_new(&manager) >= 0); - test_network_load(manager); + test_load_config(manager); udev = udev_new(); assert(udev); @@ -66,8 +71,9 @@ int main(void) { test_link(loopback); - assert(manager_udev_enumerate_links(manager) >= 0); assert(manager_udev_listen(manager) >= 0); + assert(manager_udev_enumerate_links(manager) >= 0); + assert(manager_rtnl_listen(manager) >= 0); udev_device_unref(loopback); udev_unref(udev);