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

integration: fix nodes patterns in docker_swarm info 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-05-05 00:06:52 -07:00
parent b7413d3138
commit 1187069407
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/api.bats
View File

@ -321,7 +321,8 @@ function teardown() {
swarm_manage swarm_manage
run docker_swarm info run docker_swarm info
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"Nodes: 1 "* ]] echo $output
[[ "${output}" == *"Nodes: 1"* ]]
[[ "${output}" == *"└ Labels:"*"foo=bar"* ]] [[ "${output}" == *"└ Labels:"*"foo=bar"* ]]
} }

2
test/integration/file-discovery.bats
View File

@ -24,5 +24,5 @@ function setup_file_discovery() {
run docker_swarm info run docker_swarm info
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" == *"Nodes: 2 "* ]] [[ "$output" == *"Nodes: 2"* ]]
} }

2
test/integration/helpers.bash
View File

@ -100,7 +100,7 @@ function swarm_join() {
SWARM_JOIN_PID[$i]=$! SWARM_JOIN_PID[$i]=$!
((++i)) ((++i))
done done
retry 30 1 [ -n $(docker_swarm info | grep -q "Nodes: $i") ] retry 30 1 [ -n "$(docker_swarm info | grep -q 'Nodes: $i')" ]
} }
# Stops the manager. # Stops the manager.

3
test/integration/token-discovery.bats
View File

@ -23,7 +23,8 @@ function teardown() {
swarm_join token://$TOKEN swarm_join token://$TOKEN
run docker_swarm info run docker_swarm info
[[ "$output" == *"Nodes: 2 "* ]] echo $output
[[ "$output" == *"Nodes: 2"* ]]
token_cleanup $TOKEN token_cleanup $TOKEN
} }

2
test/integration/zk-discovery.bats
View File

@ -31,5 +31,5 @@ function teardown() {
swarm_join zk://${ZK_HOST}/test swarm_join zk://${ZK_HOST}/test
run docker_swarm info run docker_swarm info
[[ "$output" == *"Nodes: 1 "* ]] [[ "$output" == *"Nodes: 1"* ]]
} }