ipfs · Jul 6, 2015
diff --git a/‎Godeps/Godeps.json
+2-2 b/‎Godeps/Godeps.json
+2-2
diff --git a/‎Godeps/_workspace/src/github.com/chriscool/go-sleep/.gitignore
+1 b/‎Godeps/_workspace/src/github.com/chriscool/go-sleep/.gitignore
+1
diff --git a/‎Godeps/_workspace/src/github.com/whyrusleeping/go-multistream/multistream.go
+1-1 b/‎Godeps/_workspace/src/github.com/whyrusleeping/go-multistream/multistream.go
+1-1
diff --git a/‎Godeps/_workspace/src/github.com/whyrusleeping/go-multistream/multistream_test.go
+78 b/‎Godeps/_workspace/src/github.com/whyrusleeping/go-multistream/multistream_test.go
+78
diff --git a/‎Godeps/_workspace/src/github.com/whyrusleeping/iptb/main.go
+11-2 b/‎Godeps/_workspace/src/github.com/whyrusleeping/iptb/main.go
+11-2
diff --git a/‎pin/pin.go
+4-1 b/‎pin/pin.go
+4-1
diff --git a/‎test/sharness/t0060-daemon.sh
+1-1 b/‎test/sharness/t0060-daemon.sh
+1-1
diff --git a/‎test/sharness/t0061-daemon-opts.sh
+1-1 b/‎test/sharness/t0061-daemon-opts.sh
+1-1
@@ -5,6 +5,7 @@ package pin
 import (
 	"fmt"
 	"sync"
+	"time"
 
 	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
@@ -243,7 +244,9 @@ func LoadPinner(d ds.ThreadSafeDatastore, dserv mdag.DAGService) (Pinner, error)
 
 	rootKey := key.Key(rootKeyBytes)
 
-	ctx := context.TODO()
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*5)
+	defer cancel()
+
 	root, err := dserv.Get(ctx, rootKey)
 	if err != nil {
 		return nil, fmt.Errorf("cannot find pinning root object: %v", err)
 
@@ -104,7 +104,7 @@ test_expect_success "ipfs help output looks good" '
 test_expect_success 'transport should be encrypted' '
   nc -w 5 localhost 4001 >swarmnc &&
   grep -q "AES-256,AES-128" swarmnc &&
-  test_must_fail grep -q "/ipfs/identify" swarmnc ||
+  test_must_fail grep -q "/multistream/1.0.0" swarmnc ||
 	test_fsh cat swarmnc
 '
 
 
@@ -29,7 +29,7 @@ test_expect_success 'api gateway should be unrestricted' '
 test_expect_success 'transport should be unencrypted' '
   go-sleep 0.5s | nc localhost "$PORT_SWARM" >swarmnc &&
   test_must_fail grep -q "AES-256,AES-128" swarmnc &&
-  grep -q "/ipfs/identify" swarmnc ||
+  grep -q "/multistream/1.0.0" swarmnc ||
   test_fsh cat swarmnc
 '
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ test_expect_success "ipfs help output looks good" '`
`104`	`104`	`test_expect_success 'transport should be encrypted' '`
`105`	`105`	`nc -w 5 localhost 4001 >swarmnc &&`
`106`	`106`	`grep -q "AES-256,AES-128" swarmnc &&`
`107`		`- test_must_fail grep -q "/ipfs/identify" swarmnc \|\|`
	`107`	`+ test_must_fail grep -q "/multistream/1.0.0" swarmnc \|\|`
`108`	`108`	`test_fsh cat swarmnc`
`109`	`109`	`'`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ test_expect_success 'api gateway should be unrestricted' '`
`29`	`29`	`test_expect_success 'transport should be unencrypted' '`
`30`	`30`	`go-sleep 0.5s \| nc localhost "$PORT_SWARM" >swarmnc &&`
`31`	`31`	`test_must_fail grep -q "AES-256,AES-128" swarmnc &&`
`32`		`- grep -q "/ipfs/identify" swarmnc \|\|`
	`32`	`+ grep -q "/multistream/1.0.0" swarmnc \|\|`
`33`	`33`	`test_fsh cat swarmnc`
`34`	`34`	`'`
`35`	`35`