mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 07:09:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1482 from stgraber/master

Browse Source 
tests: Support running on IPv6 networks
This commit is contained in:
Christian Brauner
2017-03-21 22:18:16 +01:00
committed by GitHub
parent f5c3ae5928 09ef083882
commit 79061184c2
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/lxc-test-apparmor-mount
View File

@@ -167,7 +167,7 @@ if [ "x$profile" != "x${default_profile}" ]; then
echo "FAIL: confined container was in profile $profile"
exit 1
fi
run_cmd lxc-stop -n $cname
run_cmd lxc-stop -n $cname -k
echo "test regular unconfined container"
echo "lxc.aa_profile = unconfined" >> $HDIR/.local/share/lxc/$cname/config
@@ -179,7 +179,7 @@ if [ "x$profile" != "xunconfined" ]; then
echo "FAIL: unconfined container was in profile $profile"
exit 1
fi
run_cmd lxc-stop -n $cname
run_cmd lxc-stop -n $cname -k
echo "masking $MOUNTSR"
mount --bind $dnam $MOUNTSR
@@ -209,7 +209,7 @@ if [ "x$profile" != "xunconfined" ]; then
echo "FAIL: confined container was in profile $profile"
exit 1
fi
run_cmd lxc-stop -n $cname
run_cmd lxc-stop -n $cname -k
echo "testing override"
sed -i '/aa_profile/d' $HDIR/.local/share/lxc/$cname/config
@@ -226,6 +226,6 @@ if [ "x$profile" != "x${default_profile}" ]; then
echo "FAIL: confined container was in profile $profile"
exit 1
fi
run_cmd lxc-stop -n $cname
run_cmd lxc-stop -n $cname -k
DONE=1

2
src/tests/lxc-test-checkpoint-restore
View File

@@ -48,5 +48,5 @@ lxc-checkpoint -n $name -v -s -D /tmp/checkpoint || FAIL "failed checkpointing"
lxc-wait -n $name -s STOPPED
lxc-checkpoint -n $name -v -r -D /tmp/checkpoint || FAIL "failed restoring"
lxc-stop -n $name -t 1
lxc-stop -n $name -k
lxc-destroy -f -n $name

7
src/tests/lxc-test-ubuntu
View File

@@ -61,7 +61,12 @@ for template in ubuntu ubuntu-cloud; do
done
[ -n "$lxcip" ] || FAIL "to start networking in $template container"
ping -c 1 $lxcip || FAIL "to ping $template container"
if echo "${lxcip}" | grep -q ":"; then
ping6 -c 1 $lxcip || FAIL "to ping $template container"
else
ping -c 1 $lxcip || FAIL "to ping $template container"
fi
# Check apparmor
lxcpid=`lxc-info -n $name -p -H`
aa=`cat /proc/$lxcpid/attr/current`

4
src/tests/lxc-test-unpriv
View File

@@ -185,7 +185,7 @@ for count in `seq 1 2`; do
run_cmd lxc-info -n c1
run_cmd lxc-attach -n c1 -- /bin/true
run_cmd lxc-stop -n c1
run_cmd lxc-stop -n c1 -k
done
run_cmd lxc-copy -s -n c1 -N c2
@@ -193,7 +193,7 @@ run_cmd lxc-start -n c2 -d
p1=$(run_cmd lxc-info -n c2 -p -H)
[ "$p1" != "-1" ] || { echo "Failed to start container c2"; false; }
run_cmd lxc-stop -n c2
run_cmd lxc-stop -n c2 -k
if which cgm >/dev/null 2>&1; then
echo "Testing containers under different cgroups per subsystem"