From 09a4d07ca0c822e238bb5f9ab1a3a4cb3fa81557 Mon Sep 17 00:00:00 2001 From: "scott.wang" <sxllwx@github.com> Date: Wed, 31 Jul 2019 21:07:12 +0800 Subject: [PATCH] FMT registry/etcdv3 remoting/v3 --- registry/etcdv3/listener_test.go | 19 ++++++++----------- registry/etcdv3/registry.go | 1 - registry/etcdv3/registry_test.go | 3 --- remoting/etcdv3/client_test.go | 17 ++++++++--------- remoting/etcdv3/listener_test.go | 1 - 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/registry/etcdv3/listener_test.go b/registry/etcdv3/listener_test.go index 4a805c31c..565647364 100644 --- a/registry/etcdv3/listener_test.go +++ b/registry/etcdv3/listener_test.go @@ -11,39 +11,36 @@ import ( "github.com/apache/dubbo-go/remoting" ) +func startETCDServer(t *testing.T) { -func startETCDServer(t *testing.T){ - - cmd := exec.Command("./load.sh", "start") + cmd := exec.Command("./load.sh", "start") //cmd := exec.Command("pwd") - cmd.Stdout= os.Stdout + cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout cmd.Dir = "../../remoting/etcdv3/single" - if err := cmd.Run(); err != nil{ + if err := cmd.Run(); err != nil { t.Fatal(err) } } -func stopETCDServer(t *testing.T){ +func stopETCDServer(t *testing.T) { - cmd := exec.Command("./load.sh", "stop") + cmd := exec.Command("./load.sh", "stop") //cmd := exec.Command("pwd") - cmd.Stdout= os.Stdout + cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout cmd.Dir = "../../remoting/etcdv3/single" - if err := cmd.Run(); err != nil{ + if err := cmd.Run(); err != nil { t.Fatal(err) } } - func Test_DataChange(t *testing.T) { - startETCDServer(t) defer stopETCDServer(t) diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go index 89dbe3135..f6424a6a0 100644 --- a/registry/etcdv3/registry.go +++ b/registry/etcdv3/registry.go @@ -157,7 +157,6 @@ func (r *etcdV3Registry) stop() { // close current client r.client.Close() - r.cltLock.Lock() r.client = nil r.services = nil diff --git a/registry/etcdv3/registry_test.go b/registry/etcdv3/registry_test.go index 7c69f4d31..81a8e0ddb 100644 --- a/registry/etcdv3/registry_test.go +++ b/registry/etcdv3/registry_test.go @@ -105,7 +105,6 @@ func Test_ConsumerDestory(t *testing.T) { func Test_ProviderDestory(t *testing.T) { - startETCDServer(t) defer stopETCDServer(t) @@ -118,5 +117,3 @@ func Test_ProviderDestory(t *testing.T) { reg.Destroy() assert.Equal(t, false, reg.IsAvailable()) } - - diff --git a/remoting/etcdv3/client_test.go b/remoting/etcdv3/client_test.go index f3b44797e..3d586a8bb 100644 --- a/remoting/etcdv3/client_test.go +++ b/remoting/etcdv3/client_test.go @@ -61,25 +61,25 @@ func initClient(t *testing.T) *Client { return c } -func startETCDServer(t *testing.T){ +func startETCDServer(t *testing.T) { - cmd := exec.Command("./load.sh", "start") - cmd.Stdout= os.Stdout + cmd := exec.Command("./load.sh", "start") + cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout cmd.Dir = "./single" - if err := cmd.Run(); err != nil{ + if err := cmd.Run(); err != nil { t.Fatal(err) } } -func stopETCDServer(t *testing.T){ - cmd := exec.Command("./load.sh", "stop") - cmd.Stdout= os.Stdout +func stopETCDServer(t *testing.T) { + cmd := exec.Command("./load.sh", "stop") + cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout cmd.Dir = "./single" - if err := cmd.Run(); err != nil{ + if err := cmd.Run(); err != nil { t.Fatal(err) } @@ -343,7 +343,6 @@ func TestClient_Valid(t *testing.T) { func TestClient_Done(t *testing.T) { - startETCDServer(t) defer stopETCDServer(t) diff --git a/remoting/etcdv3/listener_test.go b/remoting/etcdv3/listener_test.go index 93f3d225a..4dd6e7f31 100644 --- a/remoting/etcdv3/listener_test.go +++ b/remoting/etcdv3/listener_test.go @@ -85,4 +85,3 @@ func (m *mockDataListener) DataChange(eventType remoting.Event) bool { } return true } - -- GitLab