From 9ae24c342fd9a9b1e4e76588c4efc5d1e73333bb Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Tue, 16 Aug 2016 19:51:41 -0400
Subject: [PATCH] Add test that removes a combination of pinned, valid, and
 invalid blocks.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
---
 test/sharness/t0050-block.sh | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/test/sharness/t0050-block.sh b/test/sharness/t0050-block.sh
index 9190cdd65167..f57bc68b3670 100755
--- a/test/sharness/t0050-block.sh
+++ b/test/sharness/t0050-block.sh
@@ -10,13 +10,14 @@ test_description="Test block command"
 
 test_init_ipfs
 
+HASH="QmRKqGMAM6EZngbpjSqrvYzq5Qd8b1bSWymjSUY9zQSNDk"
+
 test_expect_success "'ipfs block put' succeeds" '
 	echo "Hello Mars!" >expected_in &&
 	ipfs block put <expected_in >actual_out
 '
 
 test_expect_success "'ipfs block put' output looks good" '
-	HASH="QmRKqGMAM6EZngbpjSqrvYzq5Qd8b1bSWymjSUY9zQSNDk" &&
 	echo "$HASH" >expected_out &&
 	test_cmp expected_out actual_out
 '
@@ -96,6 +97,38 @@ test_expect_success "multi-block 'ipfs block rm' output looks good" '
   grep -F -q "removed $FILE3HASH" actual_rm
 '
 
+test_expect_success "'add some blocks' succeeds" '
+        echo "Hello Mars!" | ipfs block put &&
+        echo "Hello Venus!" | ipfs block put
+'
+
+test_expect_success "add and pin directory" '
+  ipfs add -r adir
+  ipfs pin add -r $DIRHASH
+'
+
+HASH=QmRKqGMAM6EZngbpjSqrvYzq5Qd8b1bSWymjSUY9zQSNDk
+HASH2=QmdnpnsaEj69isdw5sNzp3h3HkaDz7xKq7BmvFFBzNr5e7
+RANDOMHASH=QRmKqGMAM6EbngbZjSqrvYzq5Qd8b1bSWymjSUY9zQSNDq
+
+test_expect_success "multi-block 'ipfs block rm' mixed" '
+  test_must_fail ipfs block rm $FILE1HASH $DIRHASH $HASH $FILE3HASH $RANDOMHASH $HASH2 2> block_rm_err
+'
+
+test_expect_success "pinned block not removed" '
+  ipfs block stat $FILE1HASH &&
+  ipfs block stat $FILE3HASH
+'
+
+test_expect_success "non-pinned blocks removed" '
+  test_must_fail ipfs block stat $HASH &&
+  test_must_fail ipfs block stat $HASH2
+'
+
+test_expect_success "error reportted on removing non-existent block" '
+  grep -q "cannot remove $RANDOMHASH" block_rm_err
+'
+
 test_expect_success "'ipfs block stat' with nothing from stdin doesnt crash" '
 	test_expect_code 1 ipfs block stat < /dev/null 2> stat_out
 '