Merge pull request #567 from anti-social/clean-up-test-prints

Celan up explicit verbosity in tests

Author: tailhook

.travis.yml

@@ -47,7 +47,7 @@ script:
         vagga \
           -E UBUNTU_MIRROR=http://mirrors.us.kernel.org/ubuntu/ \
           -E ALPINE_MIRROR=http://mirrors.gigenet.com/alpinelinux/ \
-          test tests/$test.bats --tap
+          test tests/$test.bats --tap --verbose-run --trace
       fi
     done
   else

tests/alpine.bats

@@ -10,7 +10,6 @@ setup() {
 
 @test "alpine: Check stdout" {
     run echo $(vagga v33-tar -cz vagga.yaml | tar -zt)
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
     link=$(readlink .vagga/v33-tar)
     [[ $link = ".roots/v33-tar.ba02400b/root" ]]
@@ -19,25 +18,21 @@ setup() {
 
 @test "alpine: Check version" {
     run vagga _build alpine-check-version
-    printf "%s\n" "${lines[@]}"
     [[ $status = 121 ]]
     [[ $output = *"Error checking alpine version"* ]]
 }
 
 @test "alpine: Run echo command" {
     run vagga echo-cmd hello
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
     [[ $output = hello ]]
     run vagga echo-cmd world
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
     [[ $output = world ]]
 }
 
 @test "alpine: Run bc on v3.4" {
     run vagga v34-calc 100*24
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "2400" ]]
     link=$(readlink .vagga/v34-calc)
@@ -46,7 +41,6 @@ setup() {
 
 @test "alpine: Run bc on v3.3" {
     run vagga v33-calc 100*24
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "2400" ]]
     link=$(readlink .vagga/v33-calc)
@@ -55,7 +49,6 @@ setup() {
 
 @test "alpine: Run bc on v3.2" {
     run vagga v32-calc 100*24
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "2400" ]]
     link=$(readlink .vagga/v32-calc)
@@ -64,7 +57,6 @@ setup() {
 
 @test "alpine: Run bc on v3.15" {
     run vagga v3.15-calc 23*7+3
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "164" ]]
     link=$(readlink .vagga/v3.15-calc)
@@ -73,14 +65,12 @@ setup() {
 
 @test "alpine: BuildDeps" {
     run vagga _build build-deps-with-version
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
     [[ $output = *"480191"* ]]
     link=$(readlink .vagga/build-deps-with-version)
     [[ $link = ".roots/build-deps-with-version.5d980472/root" ]]
 
     run vagga _run build-deps-with-version bc
-    printf "%s\n" "${lines[@]}"
     [[ $status = 124 ]]
 }
 
@@ -91,15 +81,13 @@ setup() {
     cp ../../alpine-keys.apk vagga_inside_alpine/
 
     run vagga vagga-alpine
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-2]} = 4eaca212 ]]
     [[ ${lines[${#lines[@]}-1]} = 4eaca212aa896f46307828745d58180d103f129545038b554912ee735cce20c9a710d3966bb5f9cabae28c8370effd13bf81e6b4af48d300dd3a2ee0c54bfbd7 ]]
 }
 
 @test "alpine: AlpineRepo minimal" {
     run vagga _build alpine-repo
-    printf "%s\n" "${lines[@]}"
     link=$(readlink .vagga/alpine-repo)
     [[ $link = ".roots/alpine-repo.992729b6/root" ]]
 
@@ -109,27 +97,23 @@ setup() {
     [[ ${repositories[0]} = ${repositories[1]} ]]
 
     run vagga _run alpine-repo tini -h
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
 }
 
 @test "alpine: AlpineRepo full" {
     run vagga _build alpine-repo-full
-    printf "%s\n" "${lines[@]}"
     link=$(readlink .vagga/alpine-repo-full)
     [[ $link = ".roots/alpine-repo-full.f703c75a/root" ]]
 
     [[ $(tail -n 1 ".vagga/alpine-repo-full/etc/apk/repositories") = \
         "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" ]]
 
     run vagga _run alpine-repo-full tini -h
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
 }
 
 @test "alpine: Repo simple" {
     run vagga _build repo-simple
-    printf "%s\n" "${lines[@]}"
     link=$(readlink .vagga/repo-simple)
     [[ $link = ".roots/repo-simple.9236cd3f/root" ]]
 
@@ -139,13 +123,11 @@ setup() {
     [[ ${repositories[0]} = ${repositories[1]} ]]
 
     run vagga _run repo-simple tini -h
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
 }
 
 @test "alpine: Repo with branch" {
     run vagga _build repo-with-branch
-    printf "%s\n" "${lines[@]}"
     link=$(readlink .vagga/repo-with-branch)
     [[ $link = ".roots/repo-with-branch.9d184847/root" ]]
 
@@ -156,32 +138,26 @@ setup() {
     [[ ${repositories[0]} = ${repositories[1]} ]]
 
     run vagga _run repo-with-branch tini -h
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
 }
 
 @test "alpine: Repo subcontainer" {
     run vagga _build repo-subcontainer
-    printf "%s\n" "${lines[@]}"
     link=$(readlink .vagga/repo-subcontainer)
     [[ $link = ".roots/repo-subcontainer.64fdb8f2/root" ]]
 
     run vagga _run repo-subcontainer tini -h
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
 }
 
 @test "alpine: Run bc on v3.7" {
     run vagga v37-calc 50*12
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "600" ]]
     run vagga new-calc 51*13
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "663" ]]
     run vagga just-calc 53*14
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "742" ]]
     link=$(readlink .vagga/v37-calc)
@@ -191,7 +167,6 @@ setup() {
 @test "alpine: descriptions" {
     run vagga
     [[ $status -eq 127 ]]
-    printf "%s\n" "${lines[@]}"
     [[ "$output" = "Available commands:
     echo-cmd
     v3.15-calc

tests/badcmd.bats

@@ -4,7 +4,6 @@ setup() {
 
 @test "badcmd: Bad command help message" {
     run vagga bad-cmd
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 126 ]]
     [[ ${lines[${#lines[@]}-2]} =~ .*'Validation Error: Field run is expected'.* ]]
     [[ ${lines[${#lines[@]}-1]} =~ .*'Decode error at .commands.bad-cmd: missing field `run`'.* ]]

tests/capsule.bats

@@ -16,37 +16,32 @@ setup() {
 
 @test "capsule: Vagga in capsule builds container and prints version" {
     run vagga vagga _capsule build --print-version v35-calc
-    printf "%s\n" "${lines[@]}"
     [[ $status = 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "v35-calc.d6315e30" ]]
 }
 
 @test "capsule: Vagga in capsule runs command" {
     run vagga vagga _capsule run v35-calc bc < calc.txt
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "2400" ]]
 }
 
 @test "capsule: Vagga can run local capsule script" {
     run vagga vagga _capsule script ./script.sh 33+27
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "60" ]]
 }
 
 @test "capsule: Vagga can run remote capsule script" {
     scripturl="https://gist.githubusercontent.com/tailhook/0cf8adf45707c05702e5568b8d390ba9/raw/9f13527f7f94c27504b33f83e76da9514939b4c0/gistfile1.txt"
     run vagga vagga _capsule script "$scripturl" 33+27
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "60" ]]
 }
 
 @test "capsule: Vagga capsule download" {
     scripturl="https://gist.githubusercontent.com/tailhook/0cf8adf45707c05702e5568b8d390ba9/raw/9f13527f7f94c27504b33f83e76da9514939b4c0/gistfile1.txt"
     run vagga vagga _capsule download "$scripturl"
-    printf "%s\n" "${lines[@]}"
     [[ $status -eq 0 ]]
     [[ ${lines[${#lines[@]}-1]} = "/vagga/cache/downloads/698319cf-gistfile1.txt" ]]
 }