From 9b316e8c667490800adbc0924a979f24b28958bd Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Sun, 4 Oct 2015 00:06:17 +0200
Subject: [PATCH 1/2] t0120: swap test_cmp arguments

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0120-bootstrap.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/sharness/t0120-bootstrap.sh b/test/sharness/t0120-bootstrap.sh
index 592c51379..7e1fd0802 100755
--- a/test/sharness/t0120-bootstrap.sh
+++ b/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
   '
 }
 
@@ -63,7 +63,7 @@ test_bootstrap_cmd() {
     echo $BP1 >add_expected
     echo $BP2 >>add_expected
     echo $BP3 >>add_expected
-    test_cmp add_actual add_expected
+    test_cmp add_expected add_actual
   '
 
   test_bootstrap_list_cmd $BP1 $BP2 $BP3
@@ -75,7 +75,7 @@ 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
+    test_cmp rm_expected rm_actual
   '
 
   test_bootstrap_list_cmd $BP2
@@ -94,7 +94,7 @@ test_bootstrap_cmd() {
     echo $BP7 >>add2_expected
     echo $BP8 >>add2_expected
     echo $BP9 >>add2_expected
-    test_cmp add2_actual add2_expected
+    test_cmp add2_expected add2_actual
   '
 
   test_bootstrap_list_cmd $BP1 $BP2 $BP3 $BP4 $BP5 $BP6 $BP7 $BP8 $BP9

From 69c2340e066d2aad5e8938ffe2829e95c512a39e Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Sun, 4 Oct 2015 00:08:16 +0200
Subject: [PATCH 2/2] t0120: add missing &&

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0120-bootstrap.sh | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/sharness/t0120-bootstrap.sh b/test/sharness/t0120-bootstrap.sh
index 7e1fd0802..57626f683 100755
--- a/test/sharness/t0120-bootstrap.sh
+++ b/test/sharness/t0120-bootstrap.sh
@@ -60,9 +60,9 @@ test_bootstrap_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap add' output looks good" '
-    echo $BP1 >add_expected
-    echo $BP2 >>add_expected
-    echo $BP3 >>add_expected
+    echo $BP1 >add_expected &&
+    echo $BP2 >>add_expected &&
+    echo $BP3 >>add_expected &&
     test_cmp add_expected add_actual
   '
 
@@ -73,8 +73,8 @@ test_bootstrap_cmd() {
   '
 
   test_expect_success "'ipfs bootstrap rm' output looks good" '
-    echo $BP1 >rm_expected
-    echo $BP3 >>rm_expected
+    echo $BP1 >rm_expected &&
+    echo $BP3 >>rm_expected &&
     test_cmp rm_expected rm_actual
   '
 
@@ -85,15 +85,15 @@ 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
+    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
   '
 
@@ -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