From 7183676de14b2623fe9d07e13c2637a208f41f79 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 10 Dec 2015 16:09:00 +0100
Subject: [PATCH] platform/tests: add nmtstp_link_del() helper

---
 src/platform/tests/test-common.c | 44 ++++++++++++++++++++++++++++++++
 src/platform/tests/test-common.h |  4 +++
 2 files changed, 48 insertions(+)

diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index 43363b84a4..1d9afa82f9 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -1097,6 +1097,50 @@ nmtstp_link_get (int ifindex,
 	return pllink;
 }
 
+void
+nmtstp_link_del (gboolean external_command,
+                 int ifindex,
+                 const char *name)
+{
+	gint64 end_time;
+	const NMPlatformLink *pllink;
+	gboolean success;
+	gs_free char *name_copy = NULL;
+
+	pllink = nmtstp_link_get (ifindex, name);
+
+	g_assert (pllink);
+
+	name = name_copy = g_strdup (pllink->name);
+	ifindex = pllink->ifindex;
+
+	external_command = nmtstp_run_command_check_external (external_command);
+
+	if (external_command) {
+		nmtstp_run_command_check ("ip link delete %s", name);
+	} else {
+		success = nm_platform_link_delete (NM_PLATFORM_GET, ifindex);
+		g_assert (success);
+	}
+
+	/* Let's wait until we get the result */
+	end_time = nm_utils_get_monotonic_timestamp_ms () + 250;
+	do {
+		if (external_command)
+			nm_platform_process_events (NM_PLATFORM_GET);
+
+		if (!nm_platform_link_get (NM_PLATFORM_GET, ifindex)) {
+			g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, name));
+			break;
+		}
+
+		/* for internal command, we expect not to reach this line.*/
+		g_assert (external_command);
+
+		g_assert (nmtstp_wait_for_signal_until (end_time));
+	} while (TRUE);
+}
+
 void
 nmtstp_link_set_updown (gboolean external_command,
                         int ifindex,
diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h
index 26a44ff909..541f259b3a 100644
--- a/src/platform/tests/test-common.h
+++ b/src/platform/tests/test-common.h
@@ -164,6 +164,10 @@ gboolean nmtstp_link_vxlan_add (gboolean external_command,
                                 const char *name,
                                 NMPlatformLnkVxlan *lnk);
 
+void nmtstp_link_del (gboolean external_command,
+                      int ifindex,
+                      const char *name);
+
 void init_tests (int *argc, char ***argv);
 void setup_tests (void);