From 4d7231d655efb8adcb2f1831d21e2e046f8caabf Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 12 Dec 2017 16:27:07 -0800 Subject: [PATCH] fix loops in sharness tests to fail the test if the inner command fails This was hiding errors. License: MIT Signed-off-by: Steven Allen --- test/sharness/t0082-repo-gc-auto.sh | 2 +- test/sharness/t0110-gateway.sh | 33 +++++++++++++++++++++++++---- test/sharness/t0250-files-api.sh | 2 +- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/test/sharness/t0082-repo-gc-auto.sh b/test/sharness/t0082-repo-gc-auto.sh index 04cfdb0bd..00c4b9e3c 100755 --- a/test/sharness/t0082-repo-gc-auto.sh +++ b/test/sharness/t0082-repo-gc-auto.sh @@ -65,7 +65,7 @@ test_gc() { test_expect_success "periodic auto gc stress test" ' for i in $(test_seq 1 20) do - test_gc + test_gc || return 1 done ' diff --git a/test/sharness/t0110-gateway.sh b/test/sharness/t0110-gateway.sh index b64cb799f..729e1f53f 100755 --- a/test/sharness/t0110-gateway.sh +++ b/test/sharness/t0110-gateway.sh @@ -139,11 +139,36 @@ test_expect_success "refs IPFS directory file through readonly API succeeds" ' test_curl_gateway_api "refs?arg=$HASH2/test" ' -test_expect_success "test gateway api is sanitized" ' - for cmd in "add" "block/put" "bootstrap" "config" "dht" "diag" "dns" "get" "id" "mount" "name/publish" "object/put" "object/new" "object/patch" "pin" "ping" "refs/local" "repo" "resolve" "stats" "swarm" "file" "update" "version" "bitswap"; do +for cmd in add \ + block/put \ + bootstrap \ + config \ + dht \ + diag \ + dns \ + get \ + id \ + mount \ + name/publish \ + object/put \ + object/new \ + object/patch \ + pin \ + ping \ + refs/local \ + repo \ + resolve \ + stats \ + swarm \ + file \ + update \ + version \ + bitswap +do + test_expect_success "test gateway api is sanitized" ' test_curl_resp_http_code "http://127.0.0.1:$port/api/v0/$cmd" "HTTP/1.1 404 Not Found" - done -' + ' +done test_expect_success "create raw-leaves node" ' echo "This is RAW!" > rfile && diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh index ecdf97925..a1e813fe5 100755 --- a/test/sharness/t0250-files-api.sh +++ b/test/sharness/t0250-files-api.sh @@ -58,7 +58,7 @@ test_sharding() { printf "" > list_exp_raw for i in `seq 100` do - echo $i | ipfs files write --create /foo/file$i + echo $i | ipfs files write --create /foo/file$i || return 1 echo file$i >> list_exp_raw done '