adder: add some additional tests for --cid-version=1

License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
ipfs · Mar 3, 2017 · 65ea7f3 · 65ea7f3
1 parent 5744bcc
commit 65ea7f3
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh
@@ -100,7 +100,7 @@ test_add_cat_5MB() {
     	test_cmp sha1_expected sha1_actual
     '
 
-    test_expect_success "'ipfs add bigfile' succeeds" '
+    test_expect_success "'ipfs add $ADD_FLAGS bigfile' succeeds" '
     	ipfs add $ADD_FLAGS mountdir/bigfile >actual ||
 		test_fsh cat daemon_err
     '
@@ -142,6 +142,9 @@ test_add_cat_raw() {
 }
 
 test_add_cat_expensive() {
+    ADD_FLAGS="$1"
+    HASH="$2"
+
     test_expect_success EXPENSIVE "generate 100MB file using go-random" '
     	random 104857600 42 >mountdir/bigfile
     '
@@ -152,12 +155,11 @@ test_add_cat_expensive() {
     	test_cmp sha1_expected sha1_actual
     '
 
-    test_expect_success EXPENSIVE "ipfs add bigfile succeeds" '
-    	ipfs add mountdir/bigfile >actual
+    test_expect_success EXPENSIVE "ipfs add $ADD_FLAGS bigfile succeeds" '
+    	ipfs add $ADD_FLAGS mountdir/bigfile >actual
     '
 
     test_expect_success EXPENSIVE "ipfs add bigfile output looks good" '
-    	HASH="QmU9SWAPPmNEKZB8umYMmjYvN7VyHqABNvdA6GUi4MMEz3" &&
     	echo "added $HASH bigfile" >expected &&
     	test_cmp expected actual
     '
@@ -426,11 +428,20 @@ test_add_cat_5MB "" "QmSr7FqYkxYWGoSfy8ZiaMWQ5vosb18DQGCzjwEQnVHkTb"
 
 test_add_cat_5MB --raw-leaves "QmbdLHCmdi48eM8T7D67oXjA1S2Puo8eMfngdHhdPukFd6"
 
+# note: the specified hash implies that internal nodes are stored
+# using CidV0 and leaves are stored using raw blocks
 test_add_cat_5MB --cid-version=1 "zdj7WiiaedqVBXjX4SNqx3jfuZideDqdLYnDzCDJ66JDMK9o2"
 
+# note: the specified hash implies that internal nodes are stored
+# using CidV0 and leaves are stored using CidV1 but using the legacy
+# format (i.e. not raw)
 test_add_cat_5MB '--cid-version=1 --raw-leaves=false' "zdj7WfgEsj897BBZj2mcfsRLhaPZcCixPV2G7DkWgF1Wdr64P"
 
-test_add_cat_expensive
+test_add_cat_expensive "" "QmU9SWAPPmNEKZB8umYMmjYvN7VyHqABNvdA6GUi4MMEz3" 
+
+# note: the specified hash implies that internal nodes are stored
+# using CidV0 and leaves are stored using raw blocks
+test_add_cat_expensive "--cid-version=1" "zdj7WcatQrtuE4WMkS4XsfsMixuQN2po4irkYhqxeJyW1wgCq"
 
 test_add_named_pipe " Post http://$API_ADDR/api/v0/add?encoding=json&progress=true&r=true&stream-channels=true:"