Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs/kubo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 93aa8d0fb390^
Choose a base ref
...
head repository: ipfs/kubo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e499ee447025
Choose a head ref
  • 4 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 4, 2015

  1. t0220: check if 'ipfs bitswap' fails 

    License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    @chriscool
    chriscool committed Oct 4, 2015
    Copy the full SHA
    93aa8d0 View commit details

  2. t0220: use test_must_be_empty() 

    License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    @chriscool
    chriscool committed Oct 4, 2015
    Copy the full SHA
    7b81e4e View commit details

  3. t0044: fail when 'ipfs add' fails 

    License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    @chriscool
    chriscool committed Oct 4, 2015
    Copy the full SHA
    bf8adc6 View commit details

  4. sharness: swap test_*cmp arguments 

    License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    @chriscool
    chriscool committed Oct 4, 2015
    Copy the full SHA
    e499ee4 View commit details
Showing with 11 additions and 10 deletions.
  1. +5 −4 test/sharness/t0044-add-symlink.sh
  2. +1 −1 test/sharness/t0141-addfilter.sh
  3. +3 −3 test/sharness/t0220-bitswap.sh
  4. +1 −1 test/sharness/x0045-add-cat-iptb.sh
  5. +1 −1 test/sharness/xt0130-multinode.sh
9 changes: 5 additions & 4 deletions test/sharness/t0044-add-symlink.sh
View file
Original file line number Diff line number Diff line change
@@ -18,12 +18,13 @@ test_expect_success "creating files succeeds" '

test_add_symlinks() {
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" '
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" '
@@ -32,7 +33,7 @@ test_add_symlinks() {

test_expect_success "output looks good" '
echo "QmdocmZeF7qwPT9Z8SiVhMSyKA2KKoA2J7jToW6z6WBmxR" > goodlink_exp &&
test_cmp goodlink_out goodlink_exp
test_cmp goodlink_exp goodlink_out
'

test_expect_success "adding a broken symlink works" '
@@ -41,7 +42,7 @@ test_add_symlinks() {

test_expect_success "output looks good" '
echo "QmWYN8SEXCgNT2PSjB6BnxAx6NJQtazWoBkTRH9GRfPFFQ" > badlink_exp &&
test_cmp badlink_out badlink_exp
test_cmp badlink_exp badlink_out
'
}

2 changes: 1 addition & 1 deletion test/sharness/t0141-addfilter.sh
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ test_swarm_filter_cmd() {
'

test_expect_success "'ipfs swarm filters' output looks good" '
test_sort_cmp list_actual list_expected
test_sort_cmp list_expected list_actual
'
}

6 changes: 3 additions & 3 deletions test/sharness/t0220-bitswap.sh
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@ test_launch_ipfs_daemon
test_expect_success "'ipfs block get' adds hash to wantlist" '
export NONEXIST=QmeXxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
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" '
@@ -23,8 +24,7 @@ test_expect_success "'ipfs bitswap unwant' succeeds" '

test_expect_success "hash was removed from wantlist" '
ipfs bitswap wantlist > wantlist_out &&
printf "" > wantlist_exp &&
test_cmp wantlist_out wantlist_exp
test_must_be_empty wantlist_out
'

test_kill_ipfs_daemon
2 changes: 1 addition & 1 deletion test/sharness/x0045-add-cat-iptb.sh
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ test_expect_success "cat that file on node2" '
test_expect_success "verify files match" '
multihash filea > expected1 &&
multihash fileb > actual1 &&
test_cmp actual1 expected1
test_cmp expected1 actual1
'

test_expect_success "shut down nodes" '
2 changes: 1 addition & 1 deletion test/sharness/xt0130-multinode.sh
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ test_expect_success "cat that file on node2" '
test_expect_success "verify files match" '
multihash filea > expected1 &&
multihash fileb > actual1 &&
test_cmp actual1 expected1
test_cmp expected1 actual1
'

test_expect_success "shut down nodes" '