opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-28 17:03:58 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1792 from ipfs/fix-test-cmp-args

Browse Source 
Fix test cmp args
This commit is contained in:
Juan Benet
2015-10-04 05:59:25 -04:00
parent d9d9798876 e499ee4470
commit f70846fe89
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/sharness/t0044-add-symlink.sh
View File

@ -18,12 +18,13 @@ test_expect_success "creating files succeeds" '
test_add_symlinks() { test_add_symlinks() {
test_expect_success "ipfs add files succeeds" ' test_expect_success "ipfs add files succeeds" '
ipfs add -q -r files | tail -n 1 > filehash_out ipfs add -q -r files >filehash_all &&
tail -n 1 filehash_all >filehash_out
' '
test_expect_success "output looks good" ' test_expect_success "output looks good" '
echo QmWdiHKoeSW8G1u7ATCgpx4yMoUhYaJBQGkyPLkS9goYZ8 > filehash_exp && echo QmWdiHKoeSW8G1u7ATCgpx4yMoUhYaJBQGkyPLkS9goYZ8 > filehash_exp &&
test_cmp filehash_out filehash_exp test_cmp filehash_exp filehash_out
' '
test_expect_success "adding a symlink adds the link itself" ' test_expect_success "adding a symlink adds the link itself" '
@ -32,7 +33,7 @@ test_add_symlinks() {
test_expect_success "output looks good" ' test_expect_success "output looks good" '
echo "QmdocmZeF7qwPT9Z8SiVhMSyKA2KKoA2J7jToW6z6WBmxR" > goodlink_exp && echo "QmdocmZeF7qwPT9Z8SiVhMSyKA2KKoA2J7jToW6z6WBmxR" > goodlink_exp &&
test_cmp goodlink_out goodlink_exp test_cmp goodlink_exp goodlink_out
' '
test_expect_success "adding a broken symlink works" ' test_expect_success "adding a broken symlink works" '
@ -41,7 +42,7 @@ test_add_symlinks() {
test_expect_success "output looks good" ' test_expect_success "output looks good" '
echo "QmWYN8SEXCgNT2PSjB6BnxAx6NJQtazWoBkTRH9GRfPFFQ" > badlink_exp && echo "QmWYN8SEXCgNT2PSjB6BnxAx6NJQtazWoBkTRH9GRfPFFQ" > badlink_exp &&
test_cmp badlink_out badlink_exp test_cmp badlink_exp badlink_out
' '
} }

2
test/sharness/t0141-addfilter.sh
View File

@ -27,7 +27,7 @@ test_swarm_filter_cmd() {
' '
test_expect_success "'ipfs swarm filters' output looks good" ' test_expect_success "'ipfs swarm filters' output looks good" '
test_sort_cmp list_actual list_expected test_sort_cmp list_expected list_actual
' '
} }

6
test/sharness/t0220-bitswap.sh
View File

@ -14,7 +14,8 @@ test_launch_ipfs_daemon
test_expect_success "'ipfs block get' adds hash to wantlist" ' test_expect_success "'ipfs block get' adds hash to wantlist" '
export NONEXIST=QmeXxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa && export NONEXIST=QmeXxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
test_expect_code 1 ipfs block get $NONEXIST --timeout=10ms && test_expect_code 1 ipfs block get $NONEXIST --timeout=10ms &&
ipfs bitswap wantlist | grep $NONEXIST ipfs bitswap wantlist >wantlist_out &&
grep $NONEXIST wantlist_out
' '
test_expect_success "'ipfs bitswap unwant' succeeds" ' test_expect_success "'ipfs bitswap unwant' succeeds" '
@ -23,8 +24,7 @@ test_expect_success "'ipfs bitswap unwant' succeeds" '
test_expect_success "hash was removed from wantlist" ' test_expect_success "hash was removed from wantlist" '
ipfs bitswap wantlist > wantlist_out && ipfs bitswap wantlist > wantlist_out &&
printf "" > wantlist_exp && test_must_be_empty wantlist_out
test_cmp wantlist_out wantlist_exp
' '
test_kill_ipfs_daemon test_kill_ipfs_daemon

2
test/sharness/x0045-add-cat-iptb.sh
View File

@ -30,7 +30,7 @@ test_expect_success "cat that file on node2" '
test_expect_success "verify files match" ' test_expect_success "verify files match" '
multihash filea > expected1 && multihash filea > expected1 &&
multihash fileb > actual1 && multihash fileb > actual1 &&
test_cmp actual1 expected1 test_cmp expected1 actual1
' '
test_expect_success "shut down nodes" ' test_expect_success "shut down nodes" '

2
test/sharness/xt0130-multinode.sh
View File

@ -30,7 +30,7 @@ test_expect_success "cat that file on node2" '
test_expect_success "verify files match" ' test_expect_success "verify files match" '
multihash filea > expected1 && multihash filea > expected1 &&
multihash fileb > actual1 && multihash fileb > actual1 &&
test_cmp actual1 expected1 test_cmp expected1 actual1
' '
test_expect_success "shut down nodes" ' test_expect_success "shut down nodes" '