fix tests

ipfs · Mar 21, 2022 · 9a27cbe · 9a27cbe
1 parent 2027c02
commit 9a27cbe
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh
@@ -348,20 +348,24 @@ test_add_cat_file() {
 
   test_expect_success "ipfs add with multiple files of same name succeeds" '
     mkdir -p mountdir/same-file/ &&
-    mkdir -p mountdir/hello2-content/ &&
     cp mountdir/hello.txt mountdir/same-file/hello.txt &&
-    cp mountdir/hello2.txt mountdir/hello2-content/hello.txt &&
-    ipfs add mountdir/hello.txt mountdir/same-file/hello.txt mountdir/hello2-content/hello.txt >actual &&
-    rm mountdir/same-file/hello.txt mountdir/hello2-content/hello.txt  &&
-    rmdir mountdir/same-file mountdir/hello2-content
+    ipfs add mountdir/hello.txt mountdir/same-file/hello.txt >actual &&
+    rm mountdir/same-file/hello.txt  &&
+    rmdir mountdir/same-file
   '
 
   test_expect_success "ipfs add with multiple files of same name output looks good" '
     echo "added QmVr26fY1tKyspEJBniVhqxQeEjhF78XerGiqWAwraVLQH hello.txt" >expected &&
-    echo "added QmVr26fY1tKyspEJBniVhqxQeEjhF78XerGiqWAwraVLQH hello.txt" >>expected &&
-    echo "added Qmf35k66MZNW2GijohUmXQEWKZU4cCGTCwK6idfnt152wJ hello.txt" >> expected &&
     test_cmp expected actual
   '
+
+    test_must_fail "ipfs add with multiple files of same name but different dirs fails" '
+      mkdir -p mountdir/same-file/ &&
+      cp mountdir/hello.txt mountdir/same-file/hello.txt &&
+      ipfs add mountdir/hello.txt mountdir/same-file/hello.txt >actual &&
+      rm mountdir/same-file/hello.txt  &&
+      rmdir mountdir/same-file
+    '
 }
 
 test_add_cat_5MB() {