Merge pull request #1786 from ipfs/improve-t0120

Improve t0120

test/sharness/t0120-bootstrap.sh

@@ -34,7 +34,7 @@ test_bootstrap_list_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap' output looks good" '
-    test_cmp list_actual list_expected
+    test_cmp list_expected list_actual
   '
 
   test_expect_success "'ipfs bootstrap list' succeeds" '
@@ -42,7 +42,7 @@ test_bootstrap_list_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap list' output looks good" '
-    test_cmp list2_actual list_expected
+    test_cmp list_expected list2_actual
   '
 }
 
@@ -60,10 +60,10 @@ test_bootstrap_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap add' output looks good" '
-    echo $BP1 >add_expected
-    echo $BP2 >>add_expected
-    echo $BP3 >>add_expected
-    test_cmp add_actual add_expected
+    echo $BP1 >add_expected &&
+    echo $BP2 >>add_expected &&
+    echo $BP3 >>add_expected &&
+    test_cmp add_expected add_actual
   '
 
   test_bootstrap_list_cmd $BP1 $BP2 $BP3
@@ -73,9 +73,9 @@ test_bootstrap_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap rm' output looks good" '
-    echo $BP1 >rm_expected
-    echo $BP3 >>rm_expected
-    test_cmp rm_actual rm_expected
+    echo $BP1 >rm_expected &&
+    echo $BP3 >>rm_expected &&
+    test_cmp rm_expected rm_actual
   '
 
   test_bootstrap_list_cmd $BP2
@@ -85,16 +85,16 @@ test_bootstrap_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap add --default' output has default BP" '
-    echo $BP1 >add2_expected
-    echo $BP2 >>add2_expected
-    echo $BP3 >>add2_expected
-    echo $BP4 >>add2_expected
-    echo $BP5 >>add2_expected
-    echo $BP6 >>add2_expected
-    echo $BP7 >>add2_expected
-    echo $BP8 >>add2_expected
-    echo $BP9 >>add2_expected
-    test_cmp add2_actual add2_expected
+    echo $BP1 >add2_expected &&
+    echo $BP2 >>add2_expected &&
+    echo $BP3 >>add2_expected &&
+    echo $BP4 >>add2_expected &&
+    echo $BP5 >>add2_expected &&
+    echo $BP6 >>add2_expected &&
+    echo $BP7 >>add2_expected &&
+    echo $BP8 >>add2_expected &&
+    echo $BP9 >>add2_expected &&
+    test_cmp add2_expected add2_actual
   '
 
   test_bootstrap_list_cmd $BP1 $BP2 $BP3 $BP4 $BP5 $BP6 $BP7 $BP8 $BP9
@@ -104,16 +104,16 @@ test_bootstrap_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap rm' output looks good" '
-    echo $BP1 >rm2_expected
-    echo $BP2 >>rm2_expected
-    echo $BP3 >>rm2_expected
-    echo $BP4 >>rm2_expected
-    echo $BP5 >>rm2_expected
-    echo $BP6 >>rm2_expected
-    echo $BP7 >>rm2_expected
-    echo $BP8 >>rm2_expected
-    echo $BP9 >>rm2_expected
-    test_cmp rm2_actual rm2_expected
+    echo $BP1 >rm2_expected &&
+    echo $BP2 >>rm2_expected &&
+    echo $BP3 >>rm2_expected &&
+    echo $BP4 >>rm2_expected &&
+    echo $BP5 >>rm2_expected &&
+    echo $BP6 >>rm2_expected &&
+    echo $BP7 >>rm2_expected &&
+    echo $BP8 >>rm2_expected &&
+    echo $BP9 >>rm2_expected &&
+    test_cmp rm2_expected rm2_actual
   '
 
   test_bootstrap_list_cmd