From 85b4163f6940fcc814210caf5f1b6f1f88d22e94 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Thu, 30 Apr 2015 17:25:52 -0700 Subject: [PATCH] travis: Lint test files (ensure they are not space indented) Fixed tab/spaces for existing integration tests. Signed-off-by: Andrea Luzzardi --- .travis.yml | 2 ++ test/integration/affinities.bats | 48 ++++++++++++++++---------------- test/integration/api.bats | 26 ++++++++--------- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cadc73e98..f6eb3d1e01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ script: - script/validate-gofmt - go vet ./... - fgt golint ./... + # Lint our test files and make sure they are not space indented. + - fgt find test -type f -exec grep -Hn -e "^ " {} \; - go test -v -race ./... - script/coverage - goveralls -service=travis-ci -coverprofile=goverage.report diff --git a/test/integration/affinities.bats b/test/integration/affinities.bats index fb1b7ddf84..0377f20544 100644 --- a/test/integration/affinities.bats +++ b/test/integration/affinities.bats @@ -44,35 +44,35 @@ function teardown() { } @test "image affinity" { - start_docker 2 - swarm_manage + start_docker 2 + swarm_manage - run docker -H ${HOSTS[0]} pull busybox - [ "$status" -eq 0 ] - run docker_swarm run --name c1 -e affinity:image==busybox -d busybox:latest sh - [ "$status" -eq 0 ] - run docker_swarm run --name c2 -e affinity:image!=busybox -d busybox:latest sh - [ "$status" -eq 0 ] - run docker_swarm run --name c3 --label 'com.docker.swarm.affinities=["image==busybox"]' -d busybox:latest sh - [ "$status" -eq 0 ] - run docker_swarm run --name c4 --label 'com.docker.swarm.affinities=["image\!=busybox"]' -d busybox:latest sh - [ "$status" -eq 0 ] + run docker -H ${HOSTS[0]} pull busybox + [ "$status" -eq 0 ] + run docker_swarm run --name c1 -e affinity:image==busybox -d busybox:latest sh + [ "$status" -eq 0 ] + run docker_swarm run --name c2 -e affinity:image!=busybox -d busybox:latest sh + [ "$status" -eq 0 ] + run docker_swarm run --name c3 --label 'com.docker.swarm.affinities=["image==busybox"]' -d busybox:latest sh + [ "$status" -eq 0 ] + run docker_swarm run --name c4 --label 'com.docker.swarm.affinities=["image\!=busybox"]' -d busybox:latest sh + [ "$status" -eq 0 ] - run docker_swarm inspect c1 - [ "$status" -eq 0 ] - [[ "${output}" == *'"Name": "node-0"'* ]] + run docker_swarm inspect c1 + [ "$status" -eq 0 ] + [[ "${output}" == *'"Name": "node-0"'* ]] - run docker_swarm inspect c2 - [ "$status" -eq 0 ] - [[ "${output}" != *'"Name": "node-0"'* ]] + run docker_swarm inspect c2 + [ "$status" -eq 0 ] + [[ "${output}" != *'"Name": "node-0"'* ]] - run docker_swarm inspect c3 - [ "$status" -eq 0 ] - [[ "${output}" == *'"Name": "node-0"'* ]] + run docker_swarm inspect c3 + [ "$status" -eq 0 ] + [[ "${output}" == *'"Name": "node-0"'* ]] - run docker_swarm inspect c4 - [ "$status" -eq 0 ] - [[ "${output}" != *'"Name": "node-0"'* ]] + run docker_swarm inspect c4 + [ "$status" -eq 0 ] + [[ "${output}" != *'"Name": "node-0"'* ]] } @test "label affinity" { diff --git a/test/integration/api.bats b/test/integration/api.bats index a1a08d9cc9..8bc21f872c 100644 --- a/test/integration/api.bats +++ b/test/integration/api.bats @@ -32,7 +32,7 @@ function teardown() { swarm_manage #create a container - run docker_swarm run -d --name test_container busybox sleep 1000 + run docker_swarm run -d --name test_container busybox sleep 1000 # test attach-ws api # jimmyxian/centos7-wssh is an image with websocket CLI(WSSH) wirtten in Nodejs @@ -47,19 +47,19 @@ function teardown() { } @test "docker build" { - start_docker 3 - swarm_manage - - run docker_swarm images -q - [ "$status" -eq 0 ] - [ "${#lines[@]}" -eq 0 ] + start_docker 3 + swarm_manage - run docker_swarm build -t test $BATS_TEST_DIRNAME/testdata/build - [ "$status" -eq 0 ] + run docker_swarm images -q + [ "$status" -eq 0 ] + [ "${#lines[@]}" -eq 0 ] - run docker_swarm images -q - [ "$status" -eq 0 ] - [ "${#lines[@]}" -eq 1 ] + run docker_swarm build -t test $BATS_TEST_DIRNAME/testdata/build + [ "$status" -eq 0 ] + + run docker_swarm images -q + [ "$status" -eq 0 ] + [ "${#lines[@]}" -eq 1 ] } @test "docker commit" { @@ -386,7 +386,7 @@ function teardown() { docker save -o $IMAGE_FILE busybox:latest start_docker 2 - swarm_manage + swarm_manage run docker_swarm images -q [ "$status" -eq 0 ]