Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcd: move util to test

Browse Source
This commit is contained in:
Xiang Li 2014-07-11 11:46:58 -07:00 committed by Yicheng Qin
parent 00935c873f
commit 042a8e3d4f
2 changed files with 74 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
etcd/v2_http_kv_test.go
View File

@ -1,10 +1,14 @@
package etcd
import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"reflect"
"strings"
"testing"
"time"
)
@ -871,3 +875,73 @@ func checkBody(body map[string]interface{}, w map[string]interface{}) error {
}
return nil
}
type testHttpClient struct {
*http.Client
}
// Creates a new HTTP client with KeepAlive disabled.
func NewTestClient() *testHttpClient {
return &testHttpClient{&http.Client{Transport: &http.Transport{DisableKeepAlives: true}}}
}
// Reads the body from the response and closes it.
func (t *testHttpClient) ReadBody(resp *http.Response) []byte {
if resp == nil {
return []byte{}
}
body, _ := ioutil.ReadAll(resp.Body)
resp.Body.Close()
return body
}
// Reads the body from the response and parses it as JSON.
func (t *testHttpClient) ReadBodyJSON(resp *http.Response) map[string]interface{} {
m := make(map[string]interface{})
b := t.ReadBody(resp)
if err := json.Unmarshal(b, &m); err != nil {
panic(fmt.Sprintf("HTTP body JSON parse error: %v: %s", err, string(b)))
}
return m
}
func (t *testHttpClient) Head(url string) (*http.Response, error) {
return t.send("HEAD", url, "application/json", nil)
}
func (t *testHttpClient) Get(url string) (*http.Response, error) {
return t.send("GET", url, "application/json", nil)
}
func (t *testHttpClient) Post(url string, bodyType string, body io.Reader) (*http.Response, error) {
return t.send("POST", url, bodyType, body)
}
func (t *testHttpClient) PostForm(url string, data url.Values) (*http.Response, error) {
return t.Post(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
}
func (t *testHttpClient) Put(url string, bodyType string, body io.Reader) (*http.Response, error) {
return t.send("PUT", url, bodyType, body)
}
func (t *testHttpClient) PutForm(url string, data url.Values) (*http.Response, error) {
return t.Put(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
}
func (t *testHttpClient) Delete(url string, bodyType string, body io.Reader) (*http.Response, error) {
return t.send("DELETE", url, bodyType, body)
}
func (t *testHttpClient) DeleteForm(url string, data url.Values) (*http.Response, error) {
return t.Delete(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
}
func (t *testHttpClient) send(method string, url string, bodyType string, body io.Reader) (*http.Response, error) {
req, err := http.NewRequest(method, url, body)
if err != nil {
return nil, err
}
req.Header.Set("Content-Type", bodyType)
return t.Do(req)
}

81
etcd/v2_util.go
View File

@ -1,81 +0,0 @@
package etcd
import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"strings"
)
type testHttpClient struct {
*http.Client
}
// Creates a new HTTP client with KeepAlive disabled.
func NewTestClient() *testHttpClient {
return &testHttpClient{&http.Client{Transport: &http.Transport{DisableKeepAlives: true}}}
}
// Reads the body from the response and closes it.
func (t *testHttpClient) ReadBody(resp *http.Response) []byte {
if resp == nil {
return []byte{}
}
body, _ := ioutil.ReadAll(resp.Body)
resp.Body.Close()
return body
}
// Reads the body from the response and parses it as JSON.
func (t *testHttpClient) ReadBodyJSON(resp *http.Response) map[string]interface{} {
m := make(map[string]interface{})
b := t.ReadBody(resp)
if err := json.Unmarshal(b, &m); err != nil {
panic(fmt.Sprintf("HTTP body JSON parse error: %v: %s", err, string(b)))
}
return m
}
func (t *testHttpClient) Head(url string) (*http.Response, error) {
return t.send("HEAD", url, "application/json", nil)
}
func (t *testHttpClient) Get(url string) (*http.Response, error) {
return t.send("GET", url, "application/json", nil)
}
func (t *testHttpClient) Post(url string, bodyType string, body io.Reader) (*http.Response, error) {
return t.send("POST", url, bodyType, body)
}
func (t *testHttpClient) PostForm(url string, data url.Values) (*http.Response, error) {
return t.Post(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
}
func (t *testHttpClient) Put(url string, bodyType string, body io.Reader) (*http.Response, error) {
return t.send("PUT", url, bodyType, body)
}
func (t *testHttpClient) PutForm(url string, data url.Values) (*http.Response, error) {
return t.Put(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
}
func (t *testHttpClient) Delete(url string, bodyType string, body io.Reader) (*http.Response, error) {
return t.send("DELETE", url, bodyType, body)
}
func (t *testHttpClient) DeleteForm(url string, data url.Values) (*http.Response, error) {
return t.Delete(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
}
func (t *testHttpClient) send(method string, url string, bodyType string, body io.Reader) (*http.Response, error) {
req, err := http.NewRequest(method, url, body)
if err != nil {
return nil, err
}
req.Header.Set("Content-Type", bodyType)
return t.Do(req)
}