jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #974 from hqhq/fix_cgroup_test 

Use absolute cgroup path for integration test
This commit is contained in:
Mrunal Patel 2016-08-08 09:32:35 -07:00 committed by GitHub
parent 142df3836b 75f765e961
commit 1fb47b08fc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/cgroups.bats
View File

@ -35,7 +35,7 @@ function check_cgroup_value() {
@test "runc update --kernel-memory (initialized)" { @test "runc update --kernel-memory (initialized)" {
# Add cgroup path # Add cgroup path
sed -i 's/\("linux": {\)/\1\n "cgroupsPath": "runc-cgroups-integration-test",/' ${BUSYBOX_BUNDLE}/config.json sed -i 's/\("linux": {\)/\1\n "cgroupsPath": "\/runc-cgroups-integration-test",/' ${BUSYBOX_BUNDLE}/config.json
# Set some initial known values # Set some initial known values
DATA=$(cat <<-EOF DATA=$(cat <<-EOF
@ -62,7 +62,7 @@ EOF
@test "runc update --kernel-memory (uninitialized)" { @test "runc update --kernel-memory (uninitialized)" {
# Add cgroup path # Add cgroup path
sed -i 's/\("linux": {\)/\1\n "cgroupsPath": "runc-cgroups-integration-test",/' ${BUSYBOX_BUNDLE}/config.json sed -i 's/\("linux": {\)/\1\n "cgroupsPath": "\/runc-cgroups-integration-test",/' ${BUSYBOX_BUNDLE}/config.json
# run a detached busybox to work with # run a detached busybox to work with
runc run -d --console /dev/pts/ptmx test_cgroups_kmem runc run -d --console /dev/pts/ptmx test_cgroups_kmem

2
tests/integration/update.bats
View File

@ -13,7 +13,7 @@ function setup() {
setup_busybox setup_busybox
# Add cgroup path # Add cgroup path
sed -i 's/\("linux": {\)/\1\n "cgroupsPath": "runc-update-integration-test",/' ${BUSYBOX_BUNDLE}/config.json sed -i 's/\("linux": {\)/\1\n "cgroupsPath": "\/runc-update-integration-test",/' ${BUSYBOX_BUNDLE}/config.json
# Set some initial known values # Set some initial known values
DATA=$(cat <<EOF DATA=$(cat <<EOF