Rebase for qm_nested patch

Signed-off-by: nsednev <[email protected]>
containers · Aug 23, 2024 · 8b7ff62 · 8b7ff62
1 parent ad4e074
commit 8b7ff62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/tests/ffi/common/prepare.sh b/tests/ffi/common/prepare.sh
@@ -68,6 +68,7 @@ run_container_in_qm() {
    exec_cmd "${run_ctr_in_qm}"
 }
 
+# Agregates 3 functions from this tool to a single init_ffi function, used to initialize environments before tests with a single function, instead of using three separate functions.
 init_ffi() {
         disk_cleanup
         prepare_test

diff --git a/tests/ffi/qm_nested/test.sh b/tests/ffi/qm_nested/test.sh
@@ -1,16 +1,12 @@
-#!/bin/bash -euvx
+#!/bin/bash
 
 # shellcheck disable=SC1091
 . ../common/prepare.sh
 
-# init_ffi() uses functions from common.sh to init the env before tests.
-init_ffi() {
-	disk_cleanup
-	prepare_test
-	reload_config
-}
+# init_ffi uses 3in1 function from common.sh to initialize the environment before tests.
+init_ffi
 
-# Declare global variables and initialize to 0
+# Declare global variables and initialize to "".
 NESTED_NAME=""
 NESTED_STATUS=""
 
@@ -55,7 +51,6 @@ compare_values() {
 }
 
 # Execute the functions
-init_ffi
 create_nested
 compare_values