tests: remove old and broken cgroup handling code from tests

We have removed the same piece of code in
ec85e5ca495 ("lxc-test-usernic: drop cgroup handling")
let's do the same for two other tests.

This fixes autopkgtests.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index 7c9d9ad50611fb808763ccf6a28b773ae905fb4f..ddf783d4bc9bfef42b5573d5e3512933adc844c4 100755 (executable)
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -119,35 +119,6 @@ chown -R $TUSER: /run/user/$(id -u $TUSER)
 
 cd $HDIR
 
-if command -v cgm >/dev/null 2>&1; then
-       cgm create all $TUSER
-       cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
-       cgm movepid all $TUSER $$
-elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
-       for d in $(cut -d : -f 2 /proc/self/cgroup); do
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
-                       string:$d string:$TUSER >/dev/null
-
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Chown \
-                       string:$d string:$TUSER int32:$(id -u $TUSER) int32:$(id -g $TUSER) >/dev/null
-
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.MovePid \
-                       string:$d string:$TUSER int32:$$ >/dev/null
-       done
-else
-       for d in /sys/fs/cgroup/*; do
-               [ "$d" = "/sys/fs/cgroup/unified" ] && continue
-               [ -f $d/cgroup.clone_children ] && echo 1 > $d/cgroup.clone_children
-               [ ! -d $d/lxctest ] && mkdir $d/lxctest
-               chown -R $TUSER: $d/lxctest
-               echo $$ > $d/lxctest/tasks
-       done
-fi
-
-
 run_cmd lxc-create -t busybox -n $cname
 
 echo "test default confined container"

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 8fb9106d637e6c9ca758ba9c4525ee55b67ba9cf..426add9da0d2347a77034fa37f48baabaf67bb9a 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -130,34 +130,6 @@ chown -R $TUSER: /run/user/$(id -u $TUSER)
 
 cd $HDIR
 
-if command -v cgm >/dev/null 2>&1; then
-       cgm create all $TUSER
-       cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
-       cgm movepid all $TUSER $$
-elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
-       for d in $(cut -d : -f 2 /proc/self/cgroup); do
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
-                       string:$d string:$TUSER >/dev/null
-
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Chown \
-                       string:$d string:$TUSER int32:$(id -u $TUSER) int32:$(id -g $TUSER) >/dev/null
-
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.MovePid \
-                       string:$d string:$TUSER int32:$$ >/dev/null
-       done
-else
-       for d in /sys/fs/cgroup/*; do
-               [ "$d" = "/sys/fs/cgroup/unified" ] && continue
-               [ -f $d/cgroup.clone_children ] && echo 1 > $d/cgroup.clone_children
-               [ ! -d $d/lxctest ] && mkdir $d/lxctest
-               chown -R $TUSER: $d/lxctest
-               echo $$ > $d/lxctest/tasks
-       done
-fi
-
 run_cmd lxc-create -t busybox -n c1 -l trace -o "${UNPRIV_LOG}"
 
 # Make sure we can start it - twice