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

Merge pull request #723 from vieux/reenable_deps 

do not use inspect -f in tests
This commit is contained in:
Andrea Luzzardi 2015-05-05 17:46:06 -07:00
parent 92abcac33c 83ed309da6
commit 34afafa3bf
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/integration/dependency.bats
View File

@ -8,9 +8,6 @@ function teardown() {
} }
@test "shared volumes dependency" { @test "shared volumes dependency" {
# FIXME: docker inspect --format is broken in docker master. See #717
skip
start_docker 2 start_docker 2
swarm_manage swarm_manage
@ -26,19 +23,16 @@ function teardown() {
[[ "${output}" == *"[/b1]"* ]] [[ "${output}" == *"[/b1]"* ]]
# check if both containers are started on the same node # check if both containers are started on the same node
run docker_swarm inspect -f "{{ .Node.Name }}" b1 run docker_swarm inspect b1
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"node-0"* ]] [[ "${output}" == *'"Name": "node-0"'* ]]
run docker_swarm inspect -f "{{ .Node.Name }}" b2 run docker_swarm inspect b2
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"node-0"* ]] [[ "${output}" == *'"Name": "node-0"'* ]]
} }
@test "links dependency" { @test "links dependency" {
# FIXME: docker inspect --format is broken in docker master. See #717
skip
start_docker 2 start_docker 2
swarm_manage swarm_manage
@ -54,19 +48,16 @@ function teardown() {
[[ "${output}" == *"[/b1:/b2/foo]"* ]] [[ "${output}" == *"[/b1:/b2/foo]"* ]]
# check if both containers are started on the same node # check if both containers are started on the same node
run docker_swarm inspect -f "{{ .Node.Name }}" b1 run docker_swarm inspect b1
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"node-1"* ]] [[ "${output}" == *'"Name": "node-1"'* ]]
run docker_swarm inspect -f "{{ .Node.Name }}" b2 run docker_swarm inspect b2
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"node-1"* ]] [[ "${output}" == *'"Name": "node-1"'* ]]
} }
@test "shared network stack dependency" { @test "shared network stack dependency" {
# FIXME: docker inspect --format is broken in docker master. See #717
skip
start_docker 2 start_docker 2
swarm_manage swarm_manage
@ -82,11 +73,11 @@ function teardown() {
[[ "${output}" == *"container:/b1"* ]] [[ "${output}" == *"container:/b1"* ]]
# check if both containers are started on the same node # check if both containers are started on the same node
run docker_swarm inspect -f "{{ .Node.Name }}" b1 run docker_swarm inspect b1
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"node-0"* ]] [[ "${output}" == *'"Name": "node-0"'* ]]
run docker_swarm inspect -f "{{ .Node.Name }}" b2 run docker_swarm inspect b2
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"node-0"* ]] [[ "${output}" == *'"Name": "node-0"'* ]]
} }