Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests more delay for passing tests on travis

Browse Source
This commit is contained in:
Xiang Li 2013-10-30 15:51:46 -07:00
parent f723651a6d
commit 0cd78e210a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/server_utils.go
View File

@ -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)