Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not create a custom HTTP client

pull/1538/head
Philip O'Toole 2015-02-09 14:29:42 -08:00
parent b3ed952eff
commit a27220a2a3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/influxd/server_single_integration_test.go
View File

@ -20,7 +20,6 @@ import (
) )
func Test_ServerSingleIntegration(t *testing.T) { func Test_ServerSingleIntegration(t *testing.T) {
t.Skip("pending review")
var ( var (
join = "" join = ""
@ -72,9 +71,8 @@ func Test_ServerSingleIntegration(t *testing.T) {
t.Log("Creating database") t.Log("Creating database")
u := urlFor(c.BrokerURL(), "query", url.Values{"q": []string{"CREATE DATABASE foo"}}) u := urlFor(c.BrokerURL(), "query", url.Values{"q": []string{"CREATE DATABASE foo"}})
httpClient := http.Client{Timeout: 100 * time.Millisecond}
resp, err := httpClient.Get(u.String()) resp, err := http.Get(u.String())
if err != nil { if err != nil {
t.Fatalf("Couldn't create database: %s", err) t.Fatalf("Couldn't create database: %s", err)
} }
@ -101,7 +99,7 @@ func Test_ServerSingleIntegration(t *testing.T) {
// Query the database exists // Query the database exists
u = urlFor(c.BrokerURL(), "query", url.Values{"q": []string{"SHOW DATABASES"}}) u = urlFor(c.BrokerURL(), "query", url.Values{"q": []string{"SHOW DATABASES"}})
resp, err = httpClient.Get(u.String()) resp, err = http.Get(u.String())
if err != nil { if err != nil {
t.Fatalf("Couldn't query databases: %s", err) t.Fatalf("Couldn't query databases: %s", err)
} }
@ -139,7 +137,7 @@ func Test_ServerSingleIntegration(t *testing.T) {
u = urlFor(c.BrokerURL(), "query", url.Values{"q": []string{"CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 1 DEFAULT"}}) u = urlFor(c.BrokerURL(), "query", url.Values{"q": []string{"CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 1 DEFAULT"}})
resp, err = httpClient.Get(u.String()) resp, err = http.Get(u.String())
if err != nil { if err != nil {
t.Fatalf("Couldn't create retention policy: %s", err) t.Fatalf("Couldn't create retention policy: %s", err)
} }
@ -172,7 +170,7 @@ func Test_ServerSingleIntegration(t *testing.T) {
buf := []byte(fmt.Sprintf(`{"database" : "foo", "retentionPolicy" : "bar", "points": [{"name": "cpu", "tags": {"host": "server01"},"timestamp": %d, "precision":"n","values": {"value": 100}}]}`, now.UnixNano())) buf := []byte(fmt.Sprintf(`{"database" : "foo", "retentionPolicy" : "bar", "points": [{"name": "cpu", "tags": {"host": "server01"},"timestamp": %d, "precision":"n","values": {"value": 100}}]}`, now.UnixNano()))
t.Logf("Writing raw data: %s", string(buf)) t.Logf("Writing raw data: %s", string(buf))
resp, err = httpClient.Post(u.String(), "application/json", bytes.NewReader(buf)) resp, err = http.Post(u.String(), "application/json", bytes.NewReader(buf))
if err != nil { if err != nil {
t.Fatalf("Couldn't write data: %s", err) t.Fatalf("Couldn't write data: %s", err)
} }
@ -188,7 +186,7 @@ func Test_ServerSingleIntegration(t *testing.T) {
t.Log("Query data") t.Log("Query data")
u = urlFor(c.BrokerURL(), "query", url.Values{"q": []string{`select value from "foo"."bar".cpu`}, "db": []string{"foo"}}) u = urlFor(c.BrokerURL(), "query", url.Values{"q": []string{`select value from "foo"."bar".cpu`}, "db": []string{"foo"}})
resp, err = httpClient.Get(u.String()) resp, err = http.Get(u.String())
if err != nil { if err != nil {
t.Fatalf("Couldn't query databases: %s", err) t.Fatalf("Couldn't query databases: %s", err)
} }