Skip to content

Commit 90801e0

Browse files
sharness: 'ipfs add' with an unregistered hash and wrapped leaves fails without crashing
1 parent 1aafcd9 commit 90801e0

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

test/sharness/t0042-add-skip.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test_description="Test add and cat commands"
1010

1111
test_add_skip() {
1212

13-
test_expect_success "'ipfs add -r' with hidden file succeeds" '
13+
test_expect_success "'ipfs add -r' with hidden file succeeds" '
1414
mkdir -p mountdir/planets/.asteroids &&
1515
echo "mars.txt" >mountdir/planets/.gitignore &&
1616
echo "Hello Mars" >mountdir/planets/mars.txt &&
@@ -22,7 +22,7 @@ test_add_skip() {
2222
ipfs add -r mountdir/planets >actual
2323
'
2424

25-
test_expect_success "'ipfs add -r' did not include . files" '
25+
test_expect_success "'ipfs add -r' did not include . files" '
2626
cat >expected <<-\EOF &&
2727
added QmZy3khu7qf696i5HtkgL2NotsCZ8wzvNZJ1eUdA5n8KaV planets/mars.txt
2828
added QmQnv4m3Q5512zgVtpbJ9z85osQrzZzGRn934AGh6iVEXz planets/venus.txt
@@ -31,11 +31,11 @@ EOF
3131
test_cmp expected actual
3232
'
3333

34-
test_expect_success "'ipfs add -r --hidden' succeeds" '
34+
test_expect_success "'ipfs add -r --hidden' succeeds" '
3535
ipfs add -r --hidden mountdir/planets >actual
3636
'
3737

38-
test_expect_success "'ipfs add -r --hidden' did include . files" '
38+
test_expect_success "'ipfs add -r --hidden' did include . files" '
3939
cat >expected <<-\EOF &&
4040
added QmcAREBcjgnUpKfyFmUGnfajA1NQS5ydqRp7WfqZ6JF8Dx planets/.asteroids/ceres.txt
4141
added QmZ5eaLybJ5GUZBNwy24AA9EEDTDpA4B8qXnuN3cGxu2uF planets/.asteroids/pallas.txt
@@ -50,11 +50,11 @@ EOF
5050
test_cmp expected actual
5151
'
5252

53-
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --hidden' succeeds" '
53+
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --hidden' succeeds" '
5454
(cd mountdir/planets && ipfs add -r --ignore-rules-path=.gitignore --hidden .) > actual
5555
'
5656

57-
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --hidden' did not include mars.txt file" '
57+
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --hidden' did not include mars.txt file" '
5858
cat >expected <<-\EOF &&
5959
added QmcAREBcjgnUpKfyFmUGnfajA1NQS5ydqRp7WfqZ6JF8Dx planets/.asteroids/ceres.txt
6060
added QmZ5eaLybJ5GUZBNwy24AA9EEDTDpA4B8qXnuN3cGxu2uF planets/.asteroids/pallas.txt
@@ -68,11 +68,11 @@ EOF
6868
test_cmp expected actual
6969
'
7070

71-
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden' succeeds" '
71+
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden' succeeds" '
7272
(cd mountdir/planets && ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden .) > actual
7373
'
7474

75-
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden' did not include ignored files" '
75+
test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden' did not include ignored files" '
7676
cat >expected <<-\EOF &&
7777
added QmaowqjedBkUrMUXgzt9c2ZnAJncM9jpJtkFfgdFstGr5a planets/.charon.txt
7878
added QmPHrRjTH8FskN3C2iv6BLekDT94o23KSL2u5qLqQqGhVH planets/.gitignore
@@ -82,7 +82,7 @@ EOF
8282
test_cmp expected actual
8383
'
8484

85-
test_expect_success "'ipfs add' includes hidden files given explicitly even without --hidden" '
85+
test_expect_success "'ipfs add' includes hidden files given explicitly even without --hidden" '
8686
mkdir -p mountdir/dotfiles &&
8787
echo "set nocompatible" > mountdir/dotfiles/.vimrc
8888
cat >expected <<-\EOF &&
@@ -93,8 +93,8 @@ EOF
9393
test_cmp expected actual
9494
'
9595

96-
test_expect_failure "'ipfs add' with an unregistered hash and wrapped leaves fails without crashing" '
97-
ipfs add --hash poseidon-bls12_381-a2-fc1 --raw-leaves=false -r mountdir/planets
96+
test_expect_success "'ipfs add' with an unregistered hash and wrapped leaves fails without crashing" '
97+
test_expect_code 1 ipfs add --hash poseidon-bls12_381-a2-fc1 --raw-leaves=false -r mountdir/planets
9898
'
9999

100100
}

0 commit comments

Comments
 (0)