docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1223 from vieux/fix_race_tests 

fix race in tests
This commit is contained in:
Victor Vieux 2015-09-18 14:18:20 -07:00
parent 02bd0e9b76 068a587f17
commit ce7c0a6dfa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/port-filters.bats
View File

@ -32,13 +32,13 @@ function teardown() {
start_docker_with_busybox 2
swarm_manage
run docker_swarm run -d --expose=80 -p 80:80 busybox sh
run docker_swarm run --expose=80 -p 80:80 busybox echo 1
[ "$status" -eq 0 ]
run docker_swarm run -d --expose=80 -p 80:80 busybox sh
run docker_swarm run --expose=80 -p 80:80 busybox echo 2
[ "$status" -eq 0 ]
# When trying to start the 3rd one, it should be error finding port 80.
run docker_swarm run -d --expose=80 -p 80:80 busybox sh
run docker_swarm run --expose=80 -p 80:80 busybox echo 3
[ "$status" -ne 0 ]
[[ "${lines[0]}" == *"unable to find a node with port 80 available"* ]]

2
test/integration/resource_management.bats
View File

@ -63,7 +63,7 @@ function teardown() {
run docker_swarm run -c 10240 busybox sh
[ "$status" -ne 0 ]
[[ "${lines[0]}" == *"no resources available to schedule container"* ]]
[[ "${output}" == *"no resources available to schedule container"* ]]
# The number of running containers should be still 0.
run docker_swarm ps -a