chore: drop uses of test_microvm_with_initrd

Use the more common test_microvm_with_api

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/integration_tests/security/test_jail.py

@@ -1,6 +1,9 @@
 # Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 """Tests that verify the jailer's behavior."""
+
+# pylint: disable=redefined-outer-name
+
 import functools
 import http.client as http_client
 import os
@@ -139,11 +142,11 @@ def test_exec_file_not_exist(test_microvm_with_api, tmp_path):
         test_microvm.spawn()
 
 
-def test_default_chroot_hierarchy(test_microvm_with_initrd):
+def test_default_chroot_hierarchy(test_microvm_with_api):
     """
     Test the folder hierarchy created by default by the jailer.
     """
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
 
     test_microvm.spawn()
 
@@ -190,11 +193,11 @@ def test_default_chroot_hierarchy(test_microvm_with_initrd):
     )
 
 
-def test_arbitrary_usocket_location(test_microvm_with_initrd):
+def test_arbitrary_usocket_location(test_microvm_with_api):
     """
     Test arbitrary location scenario for the api socket.
     """
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.extra_args = {"api-sock": "api.socket"}
 
     test_microvm.spawn()
@@ -352,12 +355,11 @@ def check_limits(pid, no_file, fsize):
     assert hard == fsize
 
 
-def test_cgroups(test_microvm_with_initrd, sys_setup_cgroups):
+def test_cgroups(test_microvm_with_api, sys_setup_cgroups):
     """
     Test the cgroups are correctly set by the jailer.
     """
-    # pylint: disable=redefined-outer-name
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.cgroup_ver = sys_setup_cgroups
     if test_microvm.jailer.cgroup_ver == 2:
         test_microvm.jailer.cgroups = ["cpu.weight.nice=10"]
@@ -389,12 +391,11 @@ def test_cgroups(test_microvm_with_initrd, sys_setup_cgroups):
         )
 
 
-def test_cgroups_custom_parent(test_microvm_with_initrd, sys_setup_cgroups):
+def test_cgroups_custom_parent(test_microvm_with_api, sys_setup_cgroups):
     """
     Test cgroups when a custom parent cgroup is used.
     """
-    # pylint: disable=redefined-outer-name
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.cgroup_ver = sys_setup_cgroups
     test_microvm.jailer.parent_cgroup = "custom_cgroup/group2"
     if test_microvm.jailer.cgroup_ver == 2:
@@ -432,12 +433,11 @@ def test_cgroups_custom_parent(test_microvm_with_initrd, sys_setup_cgroups):
         )
 
 
-def test_node_cgroups(test_microvm_with_initrd, sys_setup_cgroups):
+def test_node_cgroups(test_microvm_with_api, sys_setup_cgroups):
     """
     Test the numa node cgroups are correctly set by the jailer.
     """
-    # pylint: disable=redefined-outer-name
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.cgroup_ver = sys_setup_cgroups
 
     # Retrieve CPUs from NUMA node 0.
@@ -462,12 +462,11 @@ def test_node_cgroups(test_microvm_with_initrd, sys_setup_cgroups):
         )
 
 
-def test_cgroups_without_numa(test_microvm_with_initrd, sys_setup_cgroups):
+def test_cgroups_without_numa(test_microvm_with_api, sys_setup_cgroups):
     """
     Test the cgroups are correctly set by the jailer, without numa assignment.
     """
-    # pylint: disable=redefined-outer-name
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.cgroup_ver = sys_setup_cgroups
     if test_microvm.jailer.cgroup_ver == 2:
         test_microvm.jailer.cgroups = ["cpu.weight=2"]
@@ -494,12 +493,11 @@ def test_cgroups_without_numa(test_microvm_with_initrd, sys_setup_cgroups):
     cgroup_v2_available() is True, reason="Requires system with cgroup-v1 enabled."
 )
 @pytest.mark.usefixtures("sys_setup_cgroups")
-def test_v1_default_cgroups(test_microvm_with_initrd):
+def test_v1_default_cgroups(test_microvm_with_api):
     """
     Test if the jailer is using cgroup-v1 by default.
     """
-    # pylint: disable=redefined-outer-name
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.cgroups = ["cpu.shares=2"]
 
     test_microvm.spawn()
@@ -513,11 +511,11 @@ def test_v1_default_cgroups(test_microvm_with_initrd):
     )
 
 
-def test_args_default_resource_limits(test_microvm_with_initrd):
+def test_args_default_resource_limits(test_microvm_with_api):
     """
     Test the default resource limits are correctly set by the jailer.
     """
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
 
     test_microvm.spawn()
 
@@ -538,11 +536,11 @@ def test_args_default_resource_limits(test_microvm_with_initrd):
     assert hard == -1
 
 
-def test_args_resource_limits(test_microvm_with_initrd):
+def test_args_resource_limits(test_microvm_with_api):
     """
     Test the resource limits are correctly set by the jailer.
     """
-    test_microvm = test_microvm_with_initrd
+    test_microvm = test_microvm_with_api
     test_microvm.jailer.resource_limits = RESOURCE_LIMITS
 
     test_microvm.spawn()