From e7f88579bd6d112591d97d74920a1b68eab7e972 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 1 Aug 2013 17:42:06 -0700 Subject: [PATCH 1/2] change api due to go-etcd --- etcd_test.go | 28 ++++++++++++++++++---------- test.go | 4 ++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/etcd_test.go b/etcd_test.go index 51721dea7..124cec6ae 100644 --- a/etcd_test.go +++ b/etcd_test.go @@ -25,9 +25,11 @@ func TestSingleNode(t *testing.T) { time.Sleep(time.Second) - etcd.SyncCluster() + c := etcd.CreateClient() + + c.SyncCluster() // Test Set - result, err := etcd.Set("foo", "bar", 100) + result, err := c.Set("foo", "bar", 100) if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 { if err != nil { @@ -39,7 +41,7 @@ func TestSingleNode(t *testing.T) { time.Sleep(time.Second) - result, err = etcd.Set("foo", "bar", 100) + 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 { @@ -64,9 +66,11 @@ func TestSingleNodeRecovery(t *testing.T) { time.Sleep(time.Second) - etcd.SyncCluster() + c := etcd.CreateClient() + + c.SyncCluster() // Test Set - result, err := etcd.Set("foo", "bar", 100) + result, err := c.Set("foo", "bar", 100) if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 { if err != nil { @@ -89,7 +93,7 @@ func TestSingleNodeRecovery(t *testing.T) { time.Sleep(time.Second) - results, err := etcd.Get("foo") + results, err := c.Get("foo") if err != nil { t.Fatal("get fail: " + err.Error()) return @@ -122,10 +126,12 @@ func TestSimpleMultiNode(t *testing.T) { time.Sleep(time.Second) - etcd.SyncCluster() + c := etcd.CreateClient() + + c.SyncCluster() // Test Set - result, err := etcd.Set("foo", "bar", 100) + result, err := c.Set("foo", "bar", 100) if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 { if err != nil { @@ -137,7 +143,7 @@ func TestSimpleMultiNode(t *testing.T) { time.Sleep(time.Second) - result, err = etcd.Set("foo", "bar", 100) + 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 { @@ -165,7 +171,9 @@ func TestMultiNodeRecovery(t *testing.T) { time.Sleep(2 * time.Second) - etcd.SyncCluster() + c := etcd.CreateClient() + + c.SyncCluster() stop := make(chan bool) // Test Set diff --git a/test.go b/test.go index 5ae335131..25cac0190 100644 --- a/test.go +++ b/test.go @@ -22,11 +22,11 @@ func set(stop chan bool) { stopSet := false i := 0 - + c := etcd.CreateClient() for { key := fmt.Sprintf("%s_%v", "foo", i) - result, err := etcd.Set(key, "bar", 0) + result, err := c.Set(key, "bar", 0) if err != nil || result.Key != "/"+key || result.Value != "bar" { select { From 36839921833938603bb6cafe3162ced63ad60b7b Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Fri, 2 Aug 2013 09:54:59 -0700 Subject: [PATCH 2/2] CreateClient->NewClient --- etcd_test.go | 8 ++++---- test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etcd_test.go b/etcd_test.go index 124cec6ae..efc62f286 100644 --- a/etcd_test.go +++ b/etcd_test.go @@ -25,7 +25,7 @@ func TestSingleNode(t *testing.T) { time.Sleep(time.Second) - c := etcd.CreateClient() + c := etcd.NewClient() c.SyncCluster() // Test Set @@ -66,7 +66,7 @@ func TestSingleNodeRecovery(t *testing.T) { time.Sleep(time.Second) - c := etcd.CreateClient() + c := etcd.NewClient() c.SyncCluster() // Test Set @@ -126,7 +126,7 @@ func TestSimpleMultiNode(t *testing.T) { time.Sleep(time.Second) - c := etcd.CreateClient() + c := etcd.NewClient() c.SyncCluster() @@ -171,7 +171,7 @@ func TestMultiNodeRecovery(t *testing.T) { time.Sleep(2 * time.Second) - c := etcd.CreateClient() + c := etcd.NewClient() c.SyncCluster() diff --git a/test.go b/test.go index 25cac0190..b95abe5e1 100644 --- a/test.go +++ b/test.go @@ -22,7 +22,7 @@ func set(stop chan bool) { stopSet := false i := 0 - c := etcd.CreateClient() + c := etcd.NewClient() for { key := fmt.Sprintf("%s_%v", "foo", i)