From b6baf90dc4521fea6af57aaceeb6b7d1ebe58776 Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Fri, 15 Mar 2019 12:54:31 -0600 Subject: [PATCH] nevermind unittest multi servers because config global shares the db --- client/cli.go | 1 - client/client.go | 6 ++---- client/client_test.go | 9 ++++----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/client/cli.go b/client/cli.go index b5396cf..831e684 100644 --- a/client/cli.go +++ b/client/cli.go @@ -30,7 +30,6 @@ func main() { if err != nil { panic(err) } - log.Printf("client: %v", client) reader := bufio.NewReader(os.Stdin) for { fmt.Print("> ") diff --git a/client/client.go b/client/client.go index be025fb..5997a6d 100644 --- a/client/client.go +++ b/client/client.go @@ -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 diff --git a/client/client_test.go b/client/client_test.go index 5d25ab8..f9dfded 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -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) } } }