From d10677bb6f20dd3b4a32312a61b75ef2bb125925 Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Fri, 3 Nov 2017 18:02:21 -0500 Subject: [PATCH 1/4] Fix error format on slices. These tests were failing on `Go:master` (passing on `Go:1.8` and `Go:1.9`) --- client_test.go | 2 +- executor_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client_test.go b/client_test.go index 7e769381b..613d37659 100644 --- a/client_test.go +++ b/client_test.go @@ -90,7 +90,7 @@ func TestClient_MultiNode(t *testing.T) { } } if !ownsNum { - t.Fatalf("Trying to use slice %d on host %s, but it doesn't own that slice. It owns %s", num, s[i].Host(), owns) + t.Fatalf("Trying to use slice %d on host %s, but it doesn't own that slice. It owns %v", num, s[i].Host(), owns) } } diff --git a/executor_test.go b/executor_test.go index bf7550b25..2a5266371 100644 --- a/executor_test.go +++ b/executor_test.go @@ -781,7 +781,7 @@ func TestExecutor_Execute_FieldRange(t *testing.T) { t.Fatal(err) } else if !reflect.DeepEqual([]uint64{0}, result[0].(*pilosa.Bitmap).Bits()) { //t.Fatalf("unexpected result: %s", spew.Sdump(result)) - t.Fatalf("unexpected result: %s", result[0].(*pilosa.Bitmap).Bits()) + t.Fatalf("unexpected result: %v", result[0].(*pilosa.Bitmap).Bits()) } }) From 721baba105b8c9db90897dd437301aed1908a409 Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Fri, 3 Nov 2017 18:02:21 -0500 Subject: [PATCH 2/4] Fix error format on slices. These tests were failing on `Go:master` (passing on `Go:1.8` and `Go:1.9`) --- client_test.go | 2 +- executor_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client_test.go b/client_test.go index 7e769381b..613d37659 100644 --- a/client_test.go +++ b/client_test.go @@ -90,7 +90,7 @@ func TestClient_MultiNode(t *testing.T) { } } if !ownsNum { - t.Fatalf("Trying to use slice %d on host %s, but it doesn't own that slice. It owns %s", num, s[i].Host(), owns) + t.Fatalf("Trying to use slice %d on host %s, but it doesn't own that slice. It owns %v", num, s[i].Host(), owns) } } diff --git a/executor_test.go b/executor_test.go index bf7550b25..2a5266371 100644 --- a/executor_test.go +++ b/executor_test.go @@ -781,7 +781,7 @@ func TestExecutor_Execute_FieldRange(t *testing.T) { t.Fatal(err) } else if !reflect.DeepEqual([]uint64{0}, result[0].(*pilosa.Bitmap).Bits()) { //t.Fatalf("unexpected result: %s", spew.Sdump(result)) - t.Fatalf("unexpected result: %s", result[0].(*pilosa.Bitmap).Bits()) + t.Fatalf("unexpected result: %v", result[0].(*pilosa.Bitmap).Bits()) } }) From 1283263b707fc8a71f9ed288ea8e8351a44ca033 Mon Sep 17 00:00:00 2001 From: Michael Baird Date: Mon, 6 Nov 2017 14:01:09 -0600 Subject: [PATCH 3/4] missing formatting directive --- executor_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/executor_test.go b/executor_test.go index 2a5266371..4eb81e492 100644 --- a/executor_test.go +++ b/executor_test.go @@ -305,7 +305,7 @@ func TestExecutor_Execute_SetFieldValue(t *testing.T) { } else if !exists { t.Fatal("expected value to exist") } else if value != 25 { - t.Fatal("unexpected value: %v", value) + t.Fatalf("unexpected value: %v", value) } if value, exists, err := f.FieldValue(10, "field1"); err != nil { @@ -313,7 +313,7 @@ func TestExecutor_Execute_SetFieldValue(t *testing.T) { } else if !exists { t.Fatal("expected value to exist") } else if value != 2 { - t.Fatal("unexpected value: %v", value) + t.Fatalf("unexpected value: %v", value) } if value, exists, err := f.FieldValue(100, "field0"); err != nil { @@ -321,7 +321,7 @@ func TestExecutor_Execute_SetFieldValue(t *testing.T) { } else if !exists { t.Fatal("expected value to exist") } else if value != 10 { - t.Fatal("unexpected value: %v", value) + t.Fatalf("unexpected value: %v", value) } }) From 64da894e7eda3803827a4b1de61807f299ee8f02 Mon Sep 17 00:00:00 2001 From: Michael Baird Date: Mon, 6 Nov 2017 14:08:01 -0600 Subject: [PATCH 4/4] adding uri to string method --- uri.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/uri.go b/uri.go index ee5d23d75..21028fe44 100644 --- a/uri.go +++ b/uri.go @@ -134,6 +134,11 @@ func (u *URI) Normalize() string { return fmt.Sprintf("%s://%s:%d", scheme, u.host, u.port) } +// String returns the address as a string. +func (u URI) String() string { + return fmt.Sprintf("%s://%s:%d", u.scheme, u.host, u.port) +} + // Equals returns true if the checked URI is equivalent to this URI. func (u URI) Equals(other *URI) bool { if other == nil {