X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Ftest-network.c;h=9c372c7798e2be3e0f0620cf7a387b7b5ebbe535;hb=7b909d7407965c03caaba30daae7aee113627a83;hp=299f0fa3269de62efb9433d974e7352659dfd44e;hpb=f579559b3a14c1f1ef96c372e7626c4733e6ef7d;p=elogind.git

diff --git a/src/network/test-network.c b/src/network/test-network.c
index 299f0fa32..9c372c779 100644
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -21,20 +21,22 @@
 
 #include "networkd.h"
 
-static void test_link(struct udev_device *loopback) {
-        _cleanup_manager_free_ Manager *manager = NULL;
-        _cleanup_link_free_ Link *link = NULL;
-
-        manager_new(&manager);
+static void test_link(Manager *manager, struct udev_device *loopback) {
+        Link *link = NULL;
 
-        assert(link_new(manager, loopback, &link) >= 0);
-        assert(link);
+        assert_se(link_new(manager, loopback, &link) >= 0);
+        assert_se(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_se(network_should_reload(manager) == true);
+*/
+        assert_se(manager_load_config(manager) >= 0);
+        assert_se(manager_should_reload(manager) == false);
 }
 
 static void test_network_get(Manager *manager, struct udev_device *loopback) {
@@ -42,8 +44,8 @@ static void test_network_get(Manager *manager, struct udev_device *loopback) {
 
         /* let's assume that the test machine does not have a .network file
            that applies to the loopback device... */
-        assert(network_get(manager, loopback, &network) == -ENOENT);
-        assert(!network);
+        assert_se(network_get(manager, loopback, &network) == -ENOENT);
+        assert_se(!network);
 }
 
 int main(void) {
@@ -51,23 +53,24 @@ int main(void) {
         struct udev *udev;
         struct udev_device *loopback;
 
-        assert(manager_new(&manager) >= 0);
+        assert_se(manager_new(&manager) >= 0);
 
-        test_network_load(manager);
+        test_load_config(manager);
 
         udev = udev_new();
-        assert(udev);
+        assert_se(udev);
 
         loopback = udev_device_new_from_syspath(udev, "/sys/class/net/lo");
-        assert(loopback);
-        assert(udev_device_get_ifindex(loopback) == 1);
+        assert_se(loopback);
+        assert_se(udev_device_get_ifindex(loopback) == 1);
 
         test_network_get(manager, loopback);
 
-        test_link(loopback);
+        test_link(manager, loopback);
 
-        assert(manager_udev_enumerate_links(manager) >= 0);
-        assert(manager_udev_listen(manager) >= 0);
+        assert_se(manager_udev_listen(manager) >= 0);
+        assert_se(manager_udev_enumerate_links(manager) >= 0);
+        assert_se(manager_rtnl_listen(manager) >= 0);
 
         udev_device_unref(loopback);
         udev_unref(udev);