From 23f810e187416262b158eebfc8a3817a973b5d34 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Sat, 24 Jan 2015 14:28:07 -0800 Subject: [PATCH] test/sharness: Fixed get gzip archive test --- test/sharness/t0090-get.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/test/sharness/t0090-get.sh b/test/sharness/t0090-get.sh index 85cde28a7..450109ff9 100755 --- a/test/sharness/t0090-get.sh +++ b/test/sharness/t0090-get.sh @@ -54,7 +54,7 @@ test_expect_success "ipfs get -a output looks good" ' test_expect_success "ipfs get -a archive output is valid" ' tar -xf "$HASH".tar && test_cmp $HASH data && - rm $HASH.tar && + rm "$HASH".tar && rm $HASH ' @@ -68,10 +68,8 @@ test_expect_success "ipfs get -a -C output looks good" ' test_cmp expected actual ' -# TODO(mappum): fix this test. On osx I get: -# tar: Error opening archive: (Empty error message) test_expect_failure "gzipped tar archive output is valid" ' - tar -xf "$HASH".tar.gz && + tar -zxf $HASH.tar.gz && test_cmp $HASH data && rm "$HASH".tar.gz && rm $HASH @@ -108,12 +106,8 @@ test_expect_success "ipfs get -a -C output looks good (directory)" ' test_cmp expected actual ' -# TODO(mappum): fix this test. failing on travis: -# gzip: stdin: unexpected end of file -# tar: Child returned status 1 -# tar: Error is not recoverable: exiting now -test_expect_failure "gzipped tar archive output is valid (directory)" ' - tar -xf "$HASH2".tar.gz && +test_expect_success "gzipped tar archive output is valid (directory)" ' + tar -zxf "$HASH2".tar.gz && test_cmp dir/a "$HASH2"/a && test_cmp dir/b/c "$HASH2"/b/c && rm -r $HASH2