nevermind unittest multi servers because config global shares the db
parent
232fa86c61
commit
b6baf90dc4
|
|
@ -30,7 +30,6 @@ func main() {
|
|||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
log.Printf("client: %v", client)
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
for {
|
||||
fmt.Print("> ")
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
|
@ -128,7 +127,6 @@ func (c *Client) Get(key string) ([]byte, error) {
|
|||
}
|
||||
|
||||
func (c *Client) get(addr, key string) ([]byte, error) {
|
||||
log.Printf("GET %s FROM %s", key, addr)
|
||||
resp, err := http.Get(addr + "/" + key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -140,7 +138,8 @@ func (c *Client) get(addr, key string) ([]byte, error) {
|
|||
if resp.StatusCode != http.StatusOK {
|
||||
return nil, errors.New("bad status on get")
|
||||
}
|
||||
return ioutil.ReadAll(resp.Body)
|
||||
b, err := ioutil.ReadAll(resp.Body)
|
||||
return b, err
|
||||
}
|
||||
|
||||
func (c *Client) Set(key string, value []byte) error {
|
||||
|
|
@ -152,7 +151,6 @@ func (c *Client) Set(key string, value []byte) error {
|
|||
}
|
||||
|
||||
func (c *Client) set(addr, key string, value []byte) error {
|
||||
log.Printf("SET %s FROM %s", key, addr)
|
||||
r, err := http.NewRequest("PUT", addr+"/"+key, bytes.NewBuffer(value))
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -14,11 +14,9 @@ func TestAll(t *testing.T) {
|
|||
validKey := "key"
|
||||
validValue := "value"
|
||||
|
||||
servers := []*serve.Server{}
|
||||
addresses := []string{}
|
||||
for i := 0; i < 10; i++ {
|
||||
s := newServer(t)
|
||||
servers = append(servers, s)
|
||||
addresses = append(addresses, "http://localhost"+s.Port)
|
||||
go s.Run()
|
||||
}
|
||||
|
|
@ -30,14 +28,15 @@ func TestAll(t *testing.T) {
|
|||
|
||||
for i := 0; i < 5; i++ {
|
||||
key := fmt.Sprintf("%s-%d", validKey, i)
|
||||
if err := client.Set(key, []byte(validValue)); err != nil {
|
||||
value := validValue + string([]byte{byte(i) + 'a'})
|
||||
if err := client.Set(key, []byte(value)); err != nil {
|
||||
t.Fatalf("cannot set with client: %v", err)
|
||||
}
|
||||
|
||||
if v, err := client.Get(key); err != nil {
|
||||
t.Fatalf("cannot get with client: %v", err)
|
||||
} else if string(v) != validValue {
|
||||
t.Fatalf("wrong get with client: got %q, want %q", v, validValue)
|
||||
} else if string(v) != value {
|
||||
t.Fatalf("wrong get with client: got %q, want %q", v, value)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue