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

Merge pull request #1377 from nathanleclaire/integration_rm_rm 

Make some clean ups and fixes to the integration tests
This commit is contained in:
Nathan LeClaire 2015-07-15 11:52:02 -07:00
parent f74d71741f 02e79e06dc
commit 2c36635dd4
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration/core/supported-engine-options.bats
View File

@ -5,7 +5,7 @@ load ${BASE_TEST_DIR}/helpers.bash
@test "$DRIVER: create with supported engine options" { @test "$DRIVER: create with supported engine options" {
run machine create -d $DRIVER \ run machine create -d $DRIVER \
--engine-label spam=eggs \ --engine-label spam=eggs \
--engine-storage-driver devicemapper \ --engine-storage-driver overlay \
--engine-insecure-registry registry.myco.com \ --engine-insecure-registry registry.myco.com \
$NAME $NAME
echo "$output" echo "$output"
@ -19,15 +19,5 @@ load ${BASE_TEST_DIR}/helpers.bash
@test "$DRIVER: check for engine storage driver" { @test "$DRIVER: check for engine storage driver" {
storage_driver_info=$(docker $(machine config $NAME) info | grep "Storage Driver") storage_driver_info=$(docker $(machine config $NAME) info | grep "Storage Driver")
[[ $storage_driver_info =~ "devicemapper" ]] [[ $storage_driver_info =~ "overlay" ]]
}
@test "$DRIVER: rm after supported engine option create" {
run machine rm $NAME
[ $status -eq 0 ]
}
@test "$DRIVER: machine should not exist" {
run machine inspect $NAME
[ "$status" -eq 1 ]
} }

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

@ -25,12 +25,3 @@ export TOKEN=$(curl -sS -X POST "https://discovery-stage.hub.docker.com/v1/clust
echo ${heartbeat_arg} echo ${heartbeat_arg}
[[ "$heartbeat_arg" == "--heartbeat=5" ]] [[ "$heartbeat_arg" == "--heartbeat=5" ]]
} }
@test "clean up created nodes" {
run machine rm queenbee workerbee
[[ "$status" -eq 0 ]]
}
@test "remove dir" {
rm -rf $MACHINE_STORAGE_PATH
}