test: skip tests without permissions to create netns

thom311 · Jan 12, 2025 · 1ebeb8e · 1ebeb8e
1 parent 40b0c16
commit 1ebeb8e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/tests/cksuite-all-netns.c b/tests/cksuite-all-netns.c
@@ -73,6 +73,9 @@ START_TEST(cache_and_clone)
 	size_t i;
 	int r;
 
+	if (_nltst_skip_no_netns())
+		return;
+
 	for (i = 0; i < _NL_N_ELEMENTS(links); i++) {
 		if (links[i].add)
 			_nltst_add_link(NULL, links[i].ifname, links[i].kind,
@@ -317,6 +320,9 @@ START_TEST(route_1)
 	_nl_auto_nl_socket struct nl_sock *sk = NULL;
 	_nl_auto_nl_cache struct nl_cache *cache = NULL;
 
+	if (_nltst_skip_no_netns())
+		return;
+
 	if (_nltst_skip_no_iproute2("route_1"))
 		return;
 

diff --git a/tests/nl-test-util.c b/tests/nl-test-util.c
@@ -103,17 +103,27 @@ static struct {
 void nltst_netns_fixture_setup(void)
 {
 	ck_assert(!_netns_fixture_global.nsdata);
-
 	_netns_fixture_global.nsdata = nltst_netns_enter();
-	_assert_nltst_netns(_netns_fixture_global.nsdata);
 }
 
 void nltst_netns_fixture_teardown(void)
 {
-	_assert_nltst_netns(_netns_fixture_global.nsdata);
 	_nl_clear_pointer(&_netns_fixture_global.nsdata, nltst_netns_leave);
 }
 
+bool nltst_netns_has_netns(void)
+{
+	return !_netns_fixture_global.nsdata;
+}
+
+bool _nltst_skip_no_netns(void)
+{
+	if (nltst_netns_has_netns())
+		return false;
+	printf("skip test due to having no private netns\n");
+	return true;
+}
+
 /*****************************************************************************/
 
 static void unshare_user(void)
@@ -149,7 +159,13 @@ static void unshare_user(void)
 	}
 	r = fprintf(f, "0 %d 1", uid);
 	_nltst_assert_errno(r > 0);
-	_nltst_fclose(f);
+	r = fclose(f);
+	if (r != 0 && errno == EPERM) {
+		/* Seems this can happen during close . Ignore the inability to
+		 * unshare.
+		 * *sigh* */
+	} else
+		_nltst_assert_errno(r == 0);
 
 	/* Map current GID to root in NS to be created. */
 	f = fopen("/proc/self/gid_map", "we");
@@ -172,6 +188,9 @@ struct nltst_netns *nltst_netns_enter(void)
 	unshare_user();
 
 	r = unshare(CLONE_NEWNET | CLONE_NEWNS);
+	if (r == EPERM) {
+		return NULL;
+	}
 	_nltst_assert_errno(r == 0);
 
 	/* We need a read-only /sys so that the platform knows there's no udev. */

diff --git a/tests/nl-test-util.h b/tests/nl-test-util.h
@@ -429,6 +429,9 @@ char **_nltst_strtokv(const char *str);
 
 void nltst_netns_fixture_setup(void);
 void nltst_netns_fixture_teardown(void);
+bool nltst_netns_has_netns(void);
+
+bool _nltst_skip_no_netns(void);
 
 struct nltst_netns;