[1.1] tests/int/helpers: add get_cgroup_path

Separate it out of get_cgroup_value. Needed for the next commit. This function was initially introduced in main branch commit d4582ae. Signed-off-by: Kir Kolyshkin <[email protected]>
opencontainers · Oct 20, 2023 · f8be700 · f8be700
1 parent 5ba0e01
commit f8be700
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash
@@ -226,19 +226,27 @@ function set_cgroups_path() {
 	update_config '.linux.cgroupsPath |= "'"${OCI_CGROUPS_PATH}"'"'
 }
 
-# Get a value from a cgroup file.
-function get_cgroup_value() {
-	local source=$1
-	local cgroup var current
-
+# Get a path to cgroup directory, based on controller name.
+# Parameters:
+#  $1: controller name (like "pids") or a file name (like "pids.max").
+function get_cgroup_path() {
 	if [ "$CGROUP_UNIFIED" = "yes" ]; then
-		cgroup=$CGROUP_PATH
-	else
-		var=${source%%.*}             # controller name (e.g. memory)
-		var=CGROUP_${var^^}_BASE_PATH # variable name (e.g. CGROUP_MEMORY_BASE_PATH)
-		eval cgroup=\$"${var}${REL_CGROUPS_PATH}"
+		echo "$CGROUP_PATH"
+		return
 	fi
-	cat "$cgroup/$source"
+
+	local var cgroup
+	var=${1%%.*}                  # controller name (e.g. memory)
+	var=CGROUP_${var^^}_BASE_PATH # variable name (e.g. CGROUP_MEMORY_BASE_PATH)
+	eval cgroup=\$"${var}${REL_CGROUPS_PATH}"
+	echo "$cgroup"
+}
+
+# Get a value from a cgroup file.
+function get_cgroup_value() {
+	local cgroup
+	cgroup="$(get_cgroup_path "$1")"
+	cat "$cgroup/$1"
 }
 
 # Helper to check a if value in a cgroup file matches the expected one.