Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coreapi: Adjust some tests for go-ipfs-http-api #5926

Merged
merged 1 commit into from
Jan 17, 2019
Merged

coreapi: Adjust some tests for go-ipfs-http-api #5926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/coreapi/interface/tests/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ func (tp *provider) TestBlockRm(t *testing.T) {
if err == nil {
t.Error("expected err to exist")
}
if err.Error() != "blockservice: key not found" {
if !strings.Contains(err.Error(), "blockservice: key not found") {
t.Errorf("unexpected error; %s", err.Error())
}

err = api.Block().Rm(ctx, res.Path())
if err == nil {
t.Error("expected err to exist")
}
if err.Error() != "blockstore: block not found" {
if !strings.Contains(err.Error(), "blockstore: block not found") {
t.Errorf("unexpected error; %s", err.Error())
}

Expand Down
20 changes: 18 additions & 2 deletions core/coreapi/interface/tests/dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,20 @@ func (tp *provider) TestDhtFindPeer(t *testing.T) {
t.Fatal(err)
}

laddrs0, err := apis[0].Swarm().LocalAddrs(ctx)
if err != nil {
t.Fatal(err)
}
if len(laddrs0) != 1 {
t.Fatal("unexpected number of local addrs")
}

pi, err := apis[2].Dht().FindPeer(ctx, self0.ID())
if err != nil {
t.Fatal(err)
}

if pi.Addrs[0].String() != "/ip4/127.0.0.1/tcp/4001" {
if pi.Addrs[0].String() != laddrs0[0].String() {
t.Errorf("got unexpected address from FindPeer: %s", pi.Addrs[0].String())
}

Expand All @@ -54,7 +62,15 @@ func (tp *provider) TestDhtFindPeer(t *testing.T) {
t.Fatal(err)
}

if pi.Addrs[0].String() != "/ip4/127.0.2.1/tcp/4001" {
laddrs2, err := apis[2].Swarm().LocalAddrs(ctx)
if err != nil {
t.Fatal(err)
}
if len(laddrs2) != 1 {
t.Fatal("unexpected number of local addrs")
}

if pi.Addrs[0].String() != laddrs2[0].String() {
t.Errorf("got unexpected address from FindPeer: %s", pi.Addrs[0].String())
}
}
Expand Down
16 changes: 8 additions & 8 deletions core/coreapi/interface/tests/key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (tp *provider) TestRenameSelf(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "cannot rename key with name 'self'" {
if !strings.Contains(err.Error(), "cannot rename key with name 'self'") {
t.Fatalf("expected error 'cannot rename key with name 'self'', got '%s'", err.Error())
}
}
Expand All @@ -91,7 +91,7 @@ func (tp *provider) TestRenameSelf(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "cannot rename key with name 'self'" {
if !strings.Contains(err.Error(), "cannot rename key with name 'self'") {
t.Fatalf("expected error 'cannot rename key with name 'self'', got '%s'", err.Error())
}
}
Expand All @@ -110,7 +110,7 @@ func (tp *provider) TestRemoveSelf(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "cannot remove key with name 'self'" {
if !strings.Contains(err.Error(), "cannot remove key with name 'self'") {
t.Fatalf("expected error 'cannot remove key with name 'self'', got '%s'", err.Error())
}
}
Expand Down Expand Up @@ -206,7 +206,7 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "key with name 'foo' already exists" {
if !strings.Contains(err.Error(), "key with name 'foo' already exists") {
t.Fatalf("expected error 'key with name 'foo' already exists', got '%s'", err.Error())
}
}
Expand All @@ -215,7 +215,7 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "cannot create key with name 'self'" {
if !strings.Contains(err.Error(), "cannot create key with name 'self'") {
t.Fatalf("expected error 'cannot create key with name 'self'', got '%s'", err.Error())
}
}
Expand Down Expand Up @@ -314,7 +314,7 @@ func (tp *provider) TestRenameToSelf(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "cannot overwrite key with name 'self'" {
if !strings.Contains(err.Error(), "cannot overwrite key with name 'self'") {
t.Fatalf("expected error 'cannot overwrite key with name 'self'', got '%s'", err.Error())
}
}
Expand All @@ -338,7 +338,7 @@ func (tp *provider) TestRenameToSelfForce(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "cannot overwrite key with name 'self'" {
if !strings.Contains(err.Error(), "cannot overwrite key with name 'self'") {
t.Fatalf("expected error 'cannot overwrite key with name 'self'', got '%s'", err.Error())
}
}
Expand Down Expand Up @@ -368,7 +368,7 @@ func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
if err == nil {
t.Error("expected error to not be nil")
} else {
if err.Error() != "key by that name already exists, refusing to overwrite" {
if !strings.Contains(err.Error(), "key by that name already exists, refusing to overwrite") {
t.Fatalf("expected error 'key by that name already exists, refusing to overwrite', got '%s'", err.Error())
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/coreapi/interface/tests/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
if err == nil {
t.Fatal("expected an error")
}
if err.Error() != "no link by that name" {
if !strings.Contains(err.Error(), "no link by that name") {
t.Fatalf("unexpected error: %s", err.Error())
}

Expand Down