From c9e6d36f94fa9a4815e0ec12a1919cf49e2cae83 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Fri, 22 Jun 2018 13:44:50 -0500
Subject: [PATCH] fix some of the client tests

---
 http/client_test.go | 51 +++++++++++++--------------------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/http/client_test.go b/http/client_test.go
index 03b5b8217..5ac29ec2c 100644
--- a/http/client_test.go
+++ b/http/client_test.go
@@ -219,23 +219,17 @@ func TestClient_MultiNode(t *testing.T) {
 
 // Ensure client can bulk import data.
 func TestClient_Import(t *testing.T) {
-	t.Skip() // Until test.NewServer() works
-
-	hldr := test.MustOpenHolder()
-	defer hldr.Close()
+	cmd := test.MustRunMainWithCluster(t, 1)[0]
+	host := cmd.Server.Addr().String()
+	holder := cmd.Server.Holder()
+	hldr := test.Holder{Holder: holder}
 
 	// Load bitmap into cache to ensure cache gets updated.
 	hldr.SetBit("i", "f", 1, 0) // set a bit so the view gets created.
 	hldr.Row("i", "f", 0)
 
-	s := test.NewServer()
-	defer s.Close()
-	s.Handler.API.Cluster = test.NewCluster(1)
-	s.Handler.API.Cluster.Nodes[0].URI = s.HostURI()
-	s.Handler.API.Holder = hldr.Holder
-
 	// Send import request.
-	c := MustNewClient(s.Host(), defaultClient)
+	c := MustNewClient(host, defaultClient)
 	if err := c.Import(context.Background(), "i", "f", 0, []pilosa.Bit{
 		{RowID: 0, ColumnID: 1},
 		{RowID: 0, ColumnID: 5},
@@ -255,13 +249,12 @@ func TestClient_Import(t *testing.T) {
 
 // Ensure client can bulk import value data.
 func TestClient_ImportValue(t *testing.T) {
-	t.Skip() // Until test.NewServer() works
-
-	hldr := test.MustOpenHolder()
-	defer hldr.Close()
+	cmd := test.MustRunMainWithCluster(t, 1)[0]
+	host := cmd.Server.Addr().String()
+	holder := cmd.Server.Holder()
+	hldr := test.Holder{Holder: holder}
 
 	fldName := "f"
-
 	fo := pilosa.FieldOptions{
 		Type: pilosa.FieldTypeInt,
 		Min:  -100,
@@ -275,14 +268,8 @@ func TestClient_ImportValue(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	s := test.NewServer()
-	defer s.Close()
-	s.Handler.API.Cluster = test.NewCluster(1)
-	s.Handler.API.Cluster.Nodes[0].URI = s.HostURI()
-	s.Handler.API.Holder = hldr.Holder
-
 	// Send import request.
-	c := MustNewClient(s.Host(), defaultClient)
+	c := MustNewClient(host, defaultClient)
 	if err := c.ImportValue(context.Background(), "i", "f", 0, []pilosa.FieldValue{
 		{ColumnID: 1, Value: -10},
 		{ColumnID: 2, Value: 20},
@@ -334,26 +321,16 @@ func TestClient_ImportValue(t *testing.T) {
 
 // Ensure client can retrieve a list of all checksums for blocks in a fragment.
 func TestClient_FragmentBlocks(t *testing.T) {
-	t.Skip() // Until test.NewServer() works
+	cmd := test.MustRunMainWithCluster(t, 1)[0]
+	holder := cmd.Server.Holder()
+	hldr := test.Holder{Holder: holder}
 
-	hldr := test.MustOpenHolder()
-	defer hldr.Close()
-
-	// Set two bits on blocks 0 & 3.
 	hldr.SetBit("i", "f", 0, 1)
 	hldr.SetBit("i", "f", pilosa.HashBlockSize*3, 100)
 
 	// Set a bit on a different slice.
 	hldr.SetBit("i", "f", 0, 1)
-
-	s := test.NewServer()
-	defer s.Close()
-	s.Handler.API.Cluster = test.NewCluster(1)
-	s.Handler.API.Cluster.Nodes[0].URI = s.HostURI()
-	s.Handler.API.Holder = hldr.Holder
-
-	// Retrieve blocks.
-	c := MustNewClient(s.Host(), defaultClient)
+	c := MustNewClient(cmd.Server.Addr().String(), defaultClient)
 	blocks, err := c.FragmentBlocks(context.Background(), nil, "i", "f", 0)
 	if err != nil {
 		t.Fatal(err)