test:routing:tunnels: Improve vrf/wireguard modprobe check inside con…

…tainers
canonical · Aug 28, 2024 · 492f649 · 492f649
1 parent b2c9005
commit 492f649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/integration/routing.py b/tests/integration/routing.py
@@ -287,9 +287,10 @@ def test_link_route_v4(self):
 
     def test_vrf_basic(self):
         try:
-            subprocess.check_call(['modprobe', 'vrf'])
+            subprocess.check_call(['ip', 'link', 'add', 'dev', 'modprobe-check', 'type', 'vrf', 'table', '666'])
+            subprocess.check_call(['ip', 'link', 'del', 'modprobe-check'])
         except Exception:
-            raise unittest.SkipTest("vrf module is unavailable, can't test")
+            raise unittest.SkipTest('vrf module is unavailable, can\'t test')
 
         self.setup_eth('slaac')
         self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'vrf0'], stderr=subprocess.DEVNULL)

diff --git a/tests/integration/tunnels.py b/tests/integration/tunnels.py
@@ -92,9 +92,10 @@ def test_tunnel_ipip_without_local_address(self):
 
     def test_tunnel_wireguard(self):
         try:
-            subprocess.check_call(['modprobe', 'wireguard'])
+            subprocess.check_call(['ip', 'link', 'add', 'dev', 'modprobe-check', 'type', 'wireguard'])
+            subprocess.check_call(['ip', 'link', 'del', 'modprobe-check'])
         except Exception:
-            raise unittest.SkipTest("wireguard module is unavailable, can't test")
+            raise unittest.SkipTest('wireguard module is unavailable, can\'t test')
 
         self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'wg0'], stderr=subprocess.DEVNULL)
         self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'wg1'], stderr=subprocess.DEVNULL)