diff --git a/third_party/github.com/coreos/go-etcd/etcd/list_test.go b/third_party/github.com/coreos/go-etcd/etcd/list_test.go deleted file mode 100644 index 382bb356d912ee60c9082500678dbaf5d100b695..0000000000000000000000000000000000000000 --- a/third_party/github.com/coreos/go-etcd/etcd/list_test.go +++ /dev/null @@ -1,23 +0,0 @@ -package etcd - -import ( - "testing" - "time" -) - -func TestList(t *testing.T) { - c := NewClient(nil) - - c.Set("foo_list/foo", "bar", 100) - c.Set("foo_list/fooo", "barbar", 100) - c.Set("foo_list/foooo/foo", "barbarbar", 100) - // wait for commit - time.Sleep(time.Second) - - _, err := c.Get("foo_list") - - if err != nil { - t.Fatal(err) - } - -} diff --git a/third_party/github.com/coreos/go-etcd/etcd/set.go b/third_party/github.com/coreos/go-etcd/etcd/set.go deleted file mode 100644 index 17fc415f2f807f60848c9bd624c1722adb441cc8..0000000000000000000000000000000000000000 --- a/third_party/github.com/coreos/go-etcd/etcd/set.go +++ /dev/null @@ -1,89 +0,0 @@ -package etcd - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "path" -) - -func (c *Client) Set(key string, value string, ttl uint64) (*Response, error) { - logger.Debugf("set %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader) - v := url.Values{} - v.Set("value", value) - - if ttl > 0 { - v.Set("ttl", fmt.Sprintf("%v", ttl)) - } - - resp, err := c.sendRequest("POST", path.Join("keys", key), v.Encode()) - - if err != nil { - return nil, err - } - - b, err := ioutil.ReadAll(resp.Body) - - resp.Body.Close() - - if err != nil { - return nil, err - } - - if resp.StatusCode != http.StatusOK { - - return nil, handleError(b) - } - - return convertSetResponse(b) - -} - -// SetTo sets the value of the key to a given machine address. -// If the given machine is not available or is not leader it returns an error -// Mainly use for testing purpose. -func (c *Client) SetTo(key string, value string, ttl uint64, addr string) (*Response, error) { - v := url.Values{} - v.Set("value", value) - - if ttl > 0 { - v.Set("ttl", fmt.Sprintf("%v", ttl)) - } - - httpPath := c.createHttpPath(addr, path.Join(version, "keys", key)) - - resp, err := c.httpClient.PostForm(httpPath, v) - - if err != nil { - return nil, err - } - - b, err := ioutil.ReadAll(resp.Body) - - resp.Body.Close() - - if err != nil { - return nil, err - } - - if resp.StatusCode != http.StatusOK { - return nil, handleError(b) - } - - return convertSetResponse(b) -} - -// Convert byte stream to response. -func convertSetResponse(b []byte) (*Response, error) { - var result Response - - err := json.Unmarshal(b, &result) - - if err != nil { - return nil, err - } - - return &result, nil -} diff --git a/third_party/github.com/coreos/go-etcd/etcd/set_test.go b/third_party/github.com/coreos/go-etcd/etcd/set_test.go deleted file mode 100644 index 3809ee952a9d327ddc852d220490a3528c9fb9e0..0000000000000000000000000000000000000000 --- a/third_party/github.com/coreos/go-etcd/etcd/set_test.go +++ /dev/null @@ -1,42 +0,0 @@ -package etcd - -import ( - "testing" - "time" -) - -func TestSet(t *testing.T) { - c := NewClient(nil) - - result, err := c.Set("foo", "bar", 100) - - if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 { - if err != nil { - t.Fatal(err) - } - - t.Fatalf("Set 1 failed with %s %s %v", result.Key, result.Value, result.TTL) - } - - time.Sleep(time.Second) - - result, err = c.Set("foo", "bar", 100) - - if err != nil || result.Key != "/foo" || result.Value != "bar" || result.PrevValue != "bar" || result.TTL != 99 { - if err != nil { - t.Fatal(err) - } - t.Fatalf("Set 2 failed with %s %s %v", result.Key, result.Value, result.TTL) - } - - result, err = c.SetTo("toFoo", "bar", 100, "0.0.0.0:4001") - - if err != nil || result.Key != "/toFoo" || result.Value != "bar" || result.TTL != 99 { - if err != nil { - t.Fatal(err) - } - - t.Fatalf("SetTo failed with %s %s %v", result.Key, result.Value, result.TTL) - } - -} diff --git a/third_party/github.com/coreos/go-etcd/etcd/testAndSet.go b/third_party/github.com/coreos/go-etcd/etcd/testAndSet.go deleted file mode 100644 index bdd8ecb4fd8969cdab2e4f62686555e6f0a4436d..0000000000000000000000000000000000000000 --- a/third_party/github.com/coreos/go-etcd/etcd/testAndSet.go +++ /dev/null @@ -1,56 +0,0 @@ -package etcd - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "path" -) - -func (c *Client) TestAndSet(key string, prevValue string, value string, ttl uint64) (*Response, bool, error) { - logger.Debugf("set %s, %s[%s], ttl: %d, [%s]", key, value, prevValue, ttl, c.cluster.Leader) - v := url.Values{} - v.Set("value", value) - v.Set("prevValue", prevValue) - - if ttl > 0 { - v.Set("ttl", fmt.Sprintf("%v", ttl)) - } - - resp, err := c.sendRequest("POST", path.Join("keys", key), v.Encode()) - - if err != nil { - return nil, false, err - } - - b, err := ioutil.ReadAll(resp.Body) - - resp.Body.Close() - - if err != nil { - - return nil, false, err - } - - if resp.StatusCode != http.StatusOK { - return nil, false, handleError(b) - } - - var result Response - - err = json.Unmarshal(b, &result) - - if err != nil { - return nil, false, err - } - - if result.PrevValue == prevValue && result.Value == value { - - return &result, true, nil - } - - return &result, false, nil - -} diff --git a/third_party/github.com/coreos/go-etcd/etcd/testAndSet_test.go b/third_party/github.com/coreos/go-etcd/etcd/testAndSet_test.go deleted file mode 100644 index 5dbd854b515c7b05602ac7bd7aa6078c72bb805a..0000000000000000000000000000000000000000 --- a/third_party/github.com/coreos/go-etcd/etcd/testAndSet_test.go +++ /dev/null @@ -1,39 +0,0 @@ -package etcd - -import ( - "testing" - "time" -) - -func TestTestAndSet(t *testing.T) { - c := NewClient(nil) - - c.Set("foo_testAndSet", "bar", 100) - - time.Sleep(time.Second) - - results := make(chan bool, 3) - - for i := 0; i < 3; i++ { - testAndSet("foo_testAndSet", "bar", "barbar", results, c) - } - - count := 0 - - for i := 0; i < 3; i++ { - result := <-results - if result { - count++ - } - } - - if count != 1 { - t.Fatalf("test and set fails %v", count) - } - -} - -func testAndSet(key string, prevValue string, value string, ch chan bool, c *Client) { - _, success, _ := c.TestAndSet(key, prevValue, value, 0) - ch <- success -}