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

discovery integration: fix for docker master 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-05-04 23:17:18 -07:00
parent 88033393ba
commit 2605eff5fc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,12 @@ function setup_file_discovery() {
done done
} }
@test "docker info should return the number of nodes with file discovery" { @test "file discovery" {
start_docker 2 start_docker 2
setup_file_discovery setup_file_discovery
swarm_manage file://$DISCOVERY_FILE swarm_manage file://$DISCOVERY_FILE
run docker_swarm info run docker_swarm info
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${lines[3]}" == *"Nodes: 2" ]] [[ "$output" == *"Nodes: 2 "* ]]
} }

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

@ -12,7 +12,7 @@ function teardown() {
stop_docker stop_docker
} }
@test "token discovery should be working properly" { @test "token discovery" {
start_docker 2 start_docker 2
TOKEN=$(swarm create) TOKEN=$(swarm create)
@ -23,7 +23,7 @@ function teardown() {
swarm_join token://$TOKEN swarm_join token://$TOKEN
run docker_swarm info run docker_swarm info
[[ "${lines[3]}" == *"Nodes: 2"* ]] [[ "$output" == *"Nodes: 2 "* ]]
token_cleanup $TOKEN token_cleanup $TOKEN
} }

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

@ -23,7 +23,7 @@ function teardown() {
stop_zk stop_zk
} }
@test "zk discovery should be working correctly" { @test "zk discovery" {
start_zk start_zk
start_docker 1 start_docker 1
@ -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
[[ "${lines[3]}" == *"Nodes: 1"* ]] [[ "$output" == *"Nodes: 1 "* ]]
} }