From 0cd78e210a9c62bca639845c4f41ba4890ebd2eb Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Wed, 30 Oct 2013 15:51:46 -0700 Subject: [PATCH] tests more delay for passing tests on travis --- tests/server_utils.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/server_utils.go b/tests/server_utils.go index adddf336b..04d9cadd7 100644 --- a/tests/server_utils.go +++ b/tests/server_utils.go @@ -5,14 +5,14 @@ import ( "os" "time" - "github.com/coreos/etcd/store" "github.com/coreos/etcd/server" + "github.com/coreos/etcd/store" ) const ( - testName = "ETCDTEST" + testName = "ETCDTEST" testClientURL = "localhost:4401" - testRaftURL = "localhost:7701" + testRaftURL = "localhost:7701" ) // Starts a server in a temporary directory. @@ -22,8 +22,8 @@ func RunServer(f func(*server.Server)) { store := store.New() registry := server.NewRegistry(store) - ps := server.NewPeerServer(testName, path, testRaftURL, testRaftURL, &server.TLSConfig{Scheme:"http"}, &server.TLSInfo{}, registry, store) - s := server.New(testName, testClientURL, testClientURL, &server.TLSConfig{Scheme:"http"}, &server.TLSInfo{}, ps, registry, store) + ps := server.NewPeerServer(testName, path, testRaftURL, testRaftURL, &server.TLSConfig{Scheme: "http"}, &server.TLSInfo{}, registry, store) + s := server.New(testName, testClientURL, testClientURL, &server.TLSConfig{Scheme: "http"}, &server.TLSInfo{}, ps, registry, store) ps.SetServer(s) // Start up peer server. @@ -32,17 +32,17 @@ func RunServer(f func(*server.Server)) { c <- true ps.ListenAndServe(false, []string{}) }() - <- c + <-c // Start up etcd server. go func() { c <- true s.ListenAndServe() }() - <- c + <-c // Wait to make sure servers have started. - time.Sleep(5 * time.Millisecond) + time.Sleep(50 * time.Millisecond) // Execute the function passed in. f(s)