From 4c1201badbb84c94473ee99bd1a7ff94f2e6cad3 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sat, 11 Jun 2016 11:22:01 -0700 Subject: [PATCH] update iptb and multinode tests License: MIT Signed-off-by: Jeromy --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/main.go | 2 +- core/commands/sysdiag.go | 2 +- core/corehttp/corehttp.go | 2 +- package.json | 2 +- test/sharness/t0130-multinode.sh | 3 +-- thirdparty/pollEndpoint/main.go | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 48da82c0bac..abab005b91d 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -12,7 +12,7 @@ import ( "sync" _ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/codahale/metrics/runtime" - "gx/ipfs/QmUBa4w6CbHJUMeGJPDiMEDWsM93xToK1fTnFXnrC8Hksw/go-multiaddr-net" + "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net" ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr" diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index d768c498da0..5bd47512761 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - manet "gx/ipfs/QmUBa4w6CbHJUMeGJPDiMEDWsM93xToK1fTnFXnrC8Hksw/go-multiaddr-net" + manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net" ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr" logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log" diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 4ced66fc211..4ae37e2ee94 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -8,7 +8,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" config "github.com/ipfs/go-ipfs/repo/config" - manet "gx/ipfs/QmUBa4w6CbHJUMeGJPDiMEDWsM93xToK1fTnFXnrC8Hksw/go-multiaddr-net" + manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net" sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo" ) diff --git a/core/corehttp/corehttp.go b/core/corehttp/corehttp.go index 7c45ccac2d3..dd28a87bc09 100644 --- a/core/corehttp/corehttp.go +++ b/core/corehttp/corehttp.go @@ -11,8 +11,8 @@ import ( "time" core "github.com/ipfs/go-ipfs/core" + manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net" "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - manet "gx/ipfs/QmUBa4w6CbHJUMeGJPDiMEDWsM93xToK1fTnFXnrC8Hksw/go-multiaddr-net" logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log" ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr" ) diff --git a/package.json b/package.json index 5891ecc72b8..2b88d7707c0 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "version": "0.0.0" }, { - "hash": "QmaMGvaTmd613tWZuVjw3ohvdz1Gh1CBJ2fgb96eyp4EfE", + "hash": "Qma1FrGRasghpuETfCtsKdFtXKQffpNnakv3wG3QaMwCVi", "name": "iptb", "version": "1.0.0" }, diff --git a/test/sharness/t0130-multinode.sh b/test/sharness/t0130-multinode.sh index bd3d5960832..50bdb8cb1df 100755 --- a/test/sharness/t0130-multinode.sh +++ b/test/sharness/t0130-multinode.sh @@ -93,7 +93,6 @@ test_expect_success "set up utp testbed" ' iptb init -n 5 -p 0 -f --bootstrap=none --utp ' -# currently have issues with utp running the advanced tests -run_basic_test +run_advanced_test test_done diff --git a/thirdparty/pollEndpoint/main.go b/thirdparty/pollEndpoint/main.go index efaec3b0171..1ce39f0d1cb 100644 --- a/thirdparty/pollEndpoint/main.go +++ b/thirdparty/pollEndpoint/main.go @@ -10,7 +10,7 @@ import ( "os" "time" - manet "gx/ipfs/QmUBa4w6CbHJUMeGJPDiMEDWsM93xToK1fTnFXnrC8Hksw/go-multiaddr-net" + manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net" logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log" ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr" )