fsckd: the error code is actually returned in 'fd'

[elogind.git] / src / test / test-rtnl-manual.c

diff --git a/src/test/test-rtnl-manual.c b/src/test/test-rtnl-manual.c
index e76fb81a6672e8b35a679a9494ae3fa03f80ff55..c406454f77020ef7d51e0ab0b6933d0910fcdd58 100644 (file)
--- a/src/test/test-rtnl-manual.c
+++ b/src/test/test-rtnl-manual.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/ether.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <linux/ip.h>
@@ -29,10 +28,6 @@
 #include "util.h"
 #include "macro.h"
 #include "sd-rtnl.h"
-#include "socket-util.h"
-#include "rtnl-util.h"
-#include "event-util.h"
-#include "rtnl-internal.h"
 
 static int load_module(const char *mod_name) {
         struct kmod_ctx *ctx;
@@ -84,13 +79,12 @@ static int test_tunnel_configure(sd_rtnl *rtnl) {
         assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_NEWLINK, 0) >= 0);
         assert_se(m);
 
-        assert_se(sd_rtnl_message_append_string(m, IFLA_IFNAME, "eth0") >= 0);
+        assert_se(sd_rtnl_message_append_string(m, IFLA_IFNAME, "ipip-tunnel") >= 0);
         assert_se(sd_rtnl_message_append_u32(m, IFLA_MTU, 1234)>= 0);
 
         assert_se(sd_rtnl_message_open_container(m, IFLA_LINKINFO) >= 0);
-        assert_se(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "ipip") >= 0);
 
-        assert_se(sd_rtnl_message_open_container(m, IFLA_INFO_DATA) >= 0);
+        assert_se(sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "ipip") >= 0);
 
         inet_pton(AF_INET, "192.168.21.1", &local.s_addr);
         assert_se(sd_rtnl_message_append_u32(m, IFLA_IPTUN_LOCAL, local.s_addr) >= 0);
@@ -113,13 +107,12 @@ static int test_tunnel_configure(sd_rtnl *rtnl) {
         assert_se(sd_rtnl_message_new_link(rtnl, &n, RTM_NEWLINK, 0) >= 0);
         assert_se(n);
 
-        assert_se(sd_rtnl_message_append_string(n, IFLA_IFNAME, "eth1") >= 0);
+        assert_se(sd_rtnl_message_append_string(n, IFLA_IFNAME, "sit-tunnel") >= 0);
         assert_se(sd_rtnl_message_append_u32(n, IFLA_MTU, 1234)>= 0);
 
         assert_se(sd_rtnl_message_open_container(n, IFLA_LINKINFO) >= 0);
-        assert_se(sd_rtnl_message_append_string(n, IFLA_INFO_KIND, "sit") >= 0);
 
-        assert_se(sd_rtnl_message_open_container(n, IFLA_INFO_DATA) >= 0);
+        assert_se(sd_rtnl_message_open_container_union(n, IFLA_INFO_DATA, "sit") >= 0);
 
         assert_se(sd_rtnl_message_append_u8(n, IFLA_IPTUN_PROTO, IPPROTO_IPIP) >= 0);