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: 870d85080a70
Choose a base ref
...
head repository: ipfs/kubo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f417cb5ceb7c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 28, 2015

  1. print output on test failure for t0081 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jul 28, 2015
    Copy the full SHA
    138198e View commit details

  2. Merge pull request #1510 from ipfs/pinfail-debug 

    print output on test failure for t0081
    @jbenet
    jbenet committed Jul 28, 2015
    Copy the full SHA
    f417cb5 View commit details
Showing with 2 additions and 6 deletions.
  1. +0 −5 core/commands/pin.go
  2. +2 −1 test/sharness/t0081-repo-pinning.sh
5 changes: 0 additions & 5 deletions core/commands/pin.go
View file
Original file line number Diff line number Diff line change
@@ -60,11 +60,6 @@ on disk.
recursive = false
}

go func() {
<-req.Context().Done()
log.Error("CONTEXT IS OVER!")
}()

added, err := corerepo.Pin(n, req.Context(), req.Arguments(), recursive)
if err != nil {
res.SetError(err, cmds.ErrNormal)
3 changes: 2 additions & 1 deletion test/sharness/t0081-repo-pinning.sh
View file
Original file line number Diff line number Diff line change
@@ -243,7 +243,8 @@ test_expect_success "some are no longer there" '
test_expect_success "recursive pin fails without objects" '
ipfs pin rm "$HASH_DIR1" &&
test_must_fail ipfs pin add -r "$HASH_DIR1" --timeout=500ms 2>err_expected8 &&
grep "context deadline exceeded" err_expected8
grep "context deadline exceeded" err_expected8 ||
test_fsh cat err_expected8
'

# test_kill_ipfs_daemon