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

Merge pull request #2779 from jeanlaurent/fix-integration-test 

Fix integration test
This commit is contained in:
David Gageot 2016-01-08 12:27:12 +01:00
parent cc4930d7dc c9edb466dd
commit bacf1db2b9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/core/core-commands.bats
View File

@ -85,21 +85,21 @@ use_shared_machine
run machine url $NAME
echo ${output}
[ "$status" -eq 1 ]
[[ ${output} == *"not running"* ]]
[[ ${output} == *"Host is not running"* ]]
}
@test "$DRIVER: env should show an error when machine is stopped" {
run machine env $NAME
echo ${output}
[ "$status" -eq 1 ]
[[ ${output} == *"not running. Please start"* ]]
[[ ${output} == *"Host is not running"* ]]
}
@test "$DRIVER: version should show an error when machine is stopped" {
run machine version $NAME
echo ${output}
[ "$status" -eq 1 ]
[[ ${output} == *"not running"* ]]
[[ ${output} == *"Host is not running"* ]]
}

5
test/integration/core/swarm-options.bats
View File

@ -29,14 +29,13 @@ export TOKEN=$(curl -sS -X POST "https://discovery.hub.docker.com/v1/clusters")
@test "should not show as swarm active if normal active" {
eval $(machine env queenbee)
run machine ls
echo ${output}
run machine ls --filter name=queenbee
[[ ${lines[1]} != *"* (swarm)"* ]]
}
@test "should show as swarm active" {
eval $(machine env --swarm queenbee)
run machine ls
run machine ls --filter name=queenbee
echo ${output}
[[ ${lines[1]} == *"* (swarm)"* ]]
}