diff --git a/test/integration/api.bats b/test/integration/api.bats index 45e258be6f..8953bf5214 100644 --- a/test/integration/api.bats +++ b/test/integration/api.bats @@ -91,13 +91,13 @@ function teardown() { skip } -#@test "docker info" { -# start_docker 3 -# swarm_manage -# run docker_swarm info -# [ "$status" -eq 0 ] -# [[ "${lines[3]}" == *"Nodes: 3" ]] -#} +@test "docker info" { + start_docker 3 + swarm_manage + run docker_swarm info + [ "$status" -eq 0 ] + [[ "${lines[3]}" == *"Nodes: 3" ]] +} # FIXME @test "docker inspect" { @@ -157,41 +157,41 @@ function teardown() { skip } -#@test "docker ps -n" { -# start_docker 1 -# swarm_manage -# run docker_swarm run -d busybox sleep 42 -# run docker_swarm run -d busybox false -# run docker_swarm ps -n 3 -# # Non-running containers should be included in ps -n -# [ "${#lines[@]}" -eq 3 ] -# -# run docker_swarm run -d busybox true -# run docker_swarm ps -n 3 -# [ "${#lines[@]}" -eq 4 ] -# -# run docker_swarm run -d busybox true -# run docker_swarm ps -n 3 -# [ "${#lines[@]}" -eq 4 ] -#} -# -#@test "docker ps -l" { -# start_docker 1 -# swarm_manage -# run docker_swarm run -d busybox sleep 42 -# sleep 1 #sleep so the 2 containers don't start at the same second -# run docker_swarm run -d busybox true -# run docker_swarm ps -l -# [ "${#lines[@]}" -eq 2 ] -# # Last container should be "true", even though it's stopped. -# [[ "${lines[1]}" == *"true"* ]] -# -# sleep 1 #sleep so the container doesn't start at the same second as 'busybox true' -# run docker_swarm run -d busybox false -# run docker_swarm ps -l -# [ "${#lines[@]}" -eq 2 ] -# [[ "${lines[1]}" == *"false"* ]] -#} +@test "docker ps -n" { + start_docker 1 + swarm_manage + run docker_swarm run -d busybox sleep 42 + run docker_swarm run -d busybox false + run docker_swarm ps -n 3 + # Non-running containers should be included in ps -n + [ "${#lines[@]}" -eq 3 ] + + run docker_swarm run -d busybox true + run docker_swarm ps -n 3 + [ "${#lines[@]}" -eq 4 ] + + run docker_swarm run -d busybox true + run docker_swarm ps -n 3 + [ "${#lines[@]}" -eq 4 ] +} + +@test "docker ps -l" { + start_docker 1 + swarm_manage + run docker_swarm run -d busybox sleep 42 + sleep 1 #sleep so the 2 containers don't start at the same second + run docker_swarm run -d busybox true + run docker_swarm ps -l + [ "${#lines[@]}" -eq 2 ] + # Last container should be "true", even though it's stopped. + [[ "${lines[1]}" == *"true"* ]] + + sleep 1 #sleep so the container doesn't start at the same second as 'busybox true' + run docker_swarm run -d busybox false + run docker_swarm ps -l + [ "${#lines[@]}" -eq 2 ] + [[ "${lines[1]}" == *"false"* ]] +} # FIXME @test "docker pull" {