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

Change unit tests to expect simplest HTTP codes

pull/1302/head
Philip O'Toole 2015-01-14 11:45:07 -08:00
parent 517f6e91d6
commit ac0dc2aa7d
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handler.go
View File

@ -150,7 +150,9 @@ func (h *Handler) serveQuery(w http.ResponseWriter, r *http.Request, u *User) {
return
}
_ = json.NewEncoder(w).Encode(result)
if result != nil {
_ = json.NewEncoder(w).Encode(result)
}
}
// serveWriteSeries receives incoming series data and writes it to the database.

32
handler_test.go
View File

@ -38,7 +38,7 @@ func TestHandler_CreateDatabase(t *testing.T) {
defer s.Close()
status, body := MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "CREATE DATABASE foo"}, nil, "")
if status != http.StatusCreated {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != `` {
t.Fatalf("unexpected body: %s", body)
@ -65,7 +65,7 @@ func TestHandler_CreateDatabase_Conflict(t *testing.T) {
status, body := MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "CREATE DATABASE foo"}, nil, "")
if status != http.StatusInternalServerError {
t.Fatalf("unexpected status: %d", status)
} else if body != `error creating database: database exists` {
} else if body != `database exists` {
t.Fatalf("unexpected body: %s", body)
}
}
@ -77,7 +77,7 @@ func TestHandler_DeleteDatabase(t *testing.T) {
defer s.Close()
status, body := MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "DROP DATABASE foo"}, nil, "")
if status != http.StatusNoContent {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != "" {
t.Fatalf("unexpected body: %s", body)
@ -92,7 +92,7 @@ func TestHandler_DeleteDatabase_NotFound(t *testing.T) {
status, body := MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "DROP DATABASE bar"}, nil, "")
if status != http.StatusInternalServerError {
t.Fatalf("unexpected status: %d", status)
} else if body != `error deleting database: database not found` {
} else if body != `database not found` {
t.Fatalf("unexpected body: %s", body)
}
}
@ -122,7 +122,7 @@ func TestHandler_RetentionPolicies_DatabaseNotFound(t *testing.T) {
if status != http.StatusInternalServerError {
t.Fatalf("unexpected status: %d", status)
} else if body != `error listing retention policies: database not found` {
} else if body != `database not found` {
t.Fatalf("unexpected body: %s", body)
}
}
@ -136,7 +136,7 @@ func TestHandler_CreateRetentionPolicy(t *testing.T) {
query := map[string]string{"q": "CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 1"}
status, body := MustHTTP("GET", s.URL+`/query`, query, nil, "")
if status != http.StatusCreated {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != "" {
t.Fatalf("unexpected body: %s", body)
@ -199,7 +199,7 @@ func TestHandler_UpdateRetentionPolicy(t *testing.T) {
// Verify updated policy.
p, _ := srvr.RetentionPolicy("foo", "bar")
if status != http.StatusNoContent {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != "" {
t.Fatalf("unexpected body: %s", body)
@ -264,7 +264,7 @@ func TestHandler_DeleteRetentionPolicy(t *testing.T) {
query := map[string]string{"q": "DROP RETENTION POLICY bar ON foo"}
status, body := MustHTTP("GET", s.URL+`/query`, query, nil, "")
if status != http.StatusNoContent {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != "" {
t.Fatalf("unexpected body: %s", body)
@ -281,7 +281,7 @@ func TestHandler_DeleteRetentionPolicy_DatabaseNotFound(t *testing.T) {
if status != http.StatusInternalServerError {
t.Fatalf("unexpected status: %d", status)
} else if body != "error deleting retention policy: database not found" {
} else if body != "database not found" {
t.Fatalf("unexpected body: %s", body)
}
}
@ -297,7 +297,7 @@ func TestHandler_DeleteRetentionPolicy_NotFound(t *testing.T) {
if status != http.StatusInternalServerError {
t.Fatalf("unexpected status: %d", status)
} else if body != "error deleting retention policy: retention policy not found" {
} else if body != "retention policy not found" {
t.Fatalf("unexpected body: %s", body)
}
}
@ -369,7 +369,7 @@ func TestHandler_CreateUser(t *testing.T) {
query := map[string]string{"q": `CREATE USER testuser WITH PASSWORD "1337"`}
status, body := MustHTTP("GET", s.URL+`/query`, query, nil, "")
if status != http.StatusCreated {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != "" {
t.Fatalf("unexpected body: %s", body)
@ -430,7 +430,7 @@ func TestHandler_UpdateUser(t *testing.T) {
// Update user password.
status, body := MustHTTP("PUT", s.URL+`/users/jdoe`, nil, nil, `{"password": "7331"}`)
if status != http.StatusNoContent {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != `` {
t.Fatalf("unexpected body: %s", body)
@ -462,7 +462,7 @@ func TestHandler_DeleteUser(t *testing.T) {
query := map[string]string{"q": "DROP USER jdoe"}
status, body := MustHTTP("GET", s.URL+`/query`, query, nil, "")
if status != http.StatusNoContent {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != `` {
t.Fatalf("unexpected body: %s", body)
@ -507,7 +507,7 @@ func TestHandler_CreateDataNode(t *testing.T) {
defer s.Close()
status, body := MustHTTP("POST", s.URL+`/data_nodes`, nil, nil, `{"url":"http://localhost:1000"}`)
if status != http.StatusCreated {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != `{"id":1,"url":"http://localhost:1000"}` {
t.Fatalf("unexpected body: %s", body)
@ -550,7 +550,7 @@ func TestHandler_DeleteDataNode(t *testing.T) {
defer s.Close()
status, body := MustHTTP("DELETE", s.URL+`/data_nodes/1`, nil, nil, "")
if status != http.StatusNoContent {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
} else if body != `` {
t.Fatalf("unexpected body: %s", body)
@ -589,7 +589,7 @@ func TestHandler_AuthenticatedCreateAdminUser(t *testing.T) {
// credentials should be OK.
query = map[string]string{"q": "CREATE USER orla WITH PASSWORD pass WITH ALL PRIVILEGES"}
status, _ = MustHTTP("GET", s.URL+`/query`, query, nil, "")
if status != http.StatusCreated {
if status != http.StatusOK {
t.Fatalf("unexpected status: %d", status)
}