Fix the unprivileged tests cgroup management

To cover all the cases we have around, we need to:
 - Attempt to use cgm if present (preferred)
 - Attempt to use cgmanager directly over dbus otherwise
 - Fallback to cgroupfs

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index 503381e6ed4f00637f0f33f117ab6527c7ee7305..9ecf705bc6e68d6b54950cd4766fab464e99bb51 100755 (executable)
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -105,9 +105,32 @@ chown -R $TUSER: /run/user/$(id -u $TUSER)
 
 cd $HDIR
 
-cgm create all $TUSER
-cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
-cgm movepid all $TUSER $$
+if which 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 $d/lxctest ] && mkdir $d/lxctest
+               chown -R $TUSER: $d/lxctest
+               echo $$ > $d/lxctest/tasks
+       done
+fi
+
 
 run_cmd mkdir -p $HDIR/.cache/lxc
 [ -d /var/cache/lxc/download ] && \

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 59c264032744334f4fa72912f98ac95ce65210c6..6235901c7f9e96e394989d3537ca33e777b8377c 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -92,7 +92,11 @@ chown -R $TUSER: /run/user/$(id -u $TUSER)
 
 cd $HDIR
 
-if [ -e /sys/fs/cgroup/cgmanager/sock ]; then
+if which 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 \

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 7955d4f65a8b1208f0d2a2975523a681339b20eb..8d78fea59b38ee047db38b88603a75dcc82690b6 100755 (executable)
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -84,7 +84,11 @@ lxc.id_map = u 0 910000 10000
 lxc.id_map = g 0 910000 10000
 EOF
 
-if [ -e /sys/fs/cgroup/cgmanager/sock ]; then
+if which 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 \