refactor: separate bind mount setup/clean

Move bind mount setup/clean up into separate functions.

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

tests/integration_tests/performance/test_jailer.py

@@ -14,6 +14,28 @@
 from concurrent.futures import ProcessPoolExecutor
 
 
+def setup_bind_mounts(tmp_path, n):
+    """
+    Create bind mount points. The exact location of them
+    does not matter, they just need to exist.
+    """
+    mounts_paths = tmp_path / "mounts"
+    os.makedirs(mounts_paths)
+    for m in range(n):
+        mount_path = f"{mounts_paths}/mount{m}"
+        os.makedirs(mount_path)
+        subprocess.run(
+            ["mount", "--bind", f"{mount_path}", f"{mount_path}"], check=True
+        )
+
+
+def clean_up_mounts(tmp_path):
+    """Cleanup mounts and jailer dirs"""
+    mounts_paths = tmp_path / "mounts"
+    for d in os.listdir(mounts_paths):
+        subprocess.run(["umount", f"{mounts_paths}/{d}"], check=True)
+
+
 @pytest.mark.nonci
 @pytest.mark.parametrize("jailers", [1, 100, 300, 500])
 @pytest.mark.parametrize("mounts", [0, 100, 300, 500])
@@ -26,16 +48,7 @@ def test_jailer_startup(
 
     jailer_binary = microvm_factory.jailer_binary_path
 
-    # Create bind mount points. The exact location of them
-    # does not matter, they just need to exist.
-    mounts_paths = tmp_path / "mounts"
-    os.makedirs(mounts_paths)
-    for m in range(mounts):
-        mount_path = f"{mounts_paths}/mount{m}"
-        os.makedirs(mount_path)
-        subprocess.run(
-            ["mount", "--bind", f"{mount_path}", f"{mount_path}"], check=True
-        )
+    setup_bind_mounts(tmp_path, mounts)
 
     metrics.set_dimensions(
         {
@@ -81,9 +94,7 @@ def test_jailer_startup(
                 unit="Microseconds",
             )
 
-    # Cleanup mounts and jailer dirs
-    for d in os.listdir(mounts_paths):
-        subprocess.run(["umount", f"{mounts_paths}/{d}"], check=True)
+    clean_up_mounts(tmp_path)
     shutil.rmtree(DEFAULT_CHROOT_PATH)
 
 
@@ -114,16 +125,7 @@ def test_jailer_startup_parallel(
 
     jailer_binary = microvm_factory.jailer_binary_path
 
-    # Create bind mount points. The exact location of them
-    # does not matter, they just need to exist.
-    mounts_paths = tmp_path / "mounts"
-    os.makedirs(mounts_paths)
-    for m in range(mounts):
-        mount_path = f"{mounts_paths}/mount{m}"
-        os.makedirs(mount_path)
-        subprocess.run(
-            ["mount", "--bind", f"{mount_path}", f"{mount_path}"], check=True
-        )
+    setup_bind_mounts(tmp_path, mounts)
 
     metrics.set_dimensions(
         {
@@ -161,7 +163,5 @@ def test_jailer_startup_parallel(
                 unit="Microseconds",
             )
 
-    # Cleanup mounts and jailer dirs
-    for d in os.listdir(mounts_paths):
-        subprocess.run(["umount", f"{mounts_paths}/{d}"], check=True)
+    clean_up_mounts(tmp_path)
     shutil.rmtree(DEFAULT_CHROOT_PATH)