docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #1489 from abronan/fix_ci_kernel_memory

Browse Source 
Integration: fix --kernel-memory value set too low
This commit is contained in:
Xian Chaobo
2015-12-03 16:48:24 +08:00
parent 7ba5bc7ab0 44d96a6185
commit 913073ff5f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/api/run.bats
View File

@@ -59,8 +59,8 @@ function teardown() {
--pid=host \
--memory-swappiness=2 \
--group-add="root" \
--memory-reservation=100 \
--kernel-memory=100 \
--memory-reservation=100M \
--kernel-memory=100M \
--dns-opt="someDnsOption" \
--stop-signal="SIGKILL" \
busybox sleep 1000
@@ -92,9 +92,9 @@ function teardown() {
# group-add
[[ "${output}" == *"root"* ]]
# memory-reservation
[[ "${output}" == *"\"MemoryReservation\": 100"* ]]
[[ "${output}" == *"\"MemoryReservation\": 104857600"* ]]
# kernel-memory
[[ "${output}" == *"\"KernelMemory\": 100"* ]]
[[ "${output}" == *"\"KernelMemory\": 104857600"* ]]
# dns-opt
[[ "${output}" == *"someDnsOption"* ]]
# stop-signal