status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

consul: Refactor to pull out server config

This commit is contained in:
Armon Dadgar 2014-04-07 13:13:23 -07:00
parent 2c212516ee
commit 462ed3cee0
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
consul/server_test.go
View File

@ -25,19 +25,11 @@ func tmpDir(t *testing.T) string {
return dir
}
func testServer(t *testing.T) (string, *Server) {
return testServerDC(t, "dc1")
}
func testServerDC(t *testing.T, dc string) (string, *Server) {
return testServerDCBootstrap(t, dc, true)
}
func testServerDCBootstrap(t *testing.T, dc string, bootstrap bool) (string, *Server) {
func testServerConfig(t *testing.T) (string, *Config) {
dir := tmpDir(t)
config := DefaultConfig()
config.Bootstrap = bootstrap
config.Datacenter = dc
config.Bootstrap = true
config.Datacenter = "dc1"
config.DataDir = dir
// Adjust the ports
@ -65,7 +57,21 @@ func testServerDCBootstrap(t *testing.T, dc string, bootstrap bool) (string, *Se
config.RaftConfig.ElectionTimeout = 40 * time.Millisecond
config.ReconcileInterval = 100 * time.Millisecond
return dir, config
}
func testServer(t *testing.T) (string, *Server) {
return testServerDC(t, "dc1")
}
func testServerDC(t *testing.T, dc string) (string, *Server) {
return testServerDCBootstrap(t, dc, true)
}
func testServerDCBootstrap(t *testing.T, dc string, bootstrap bool) (string, *Server) {
dir, config := testServerConfig(t)
config.Datacenter = dc
config.Bootstrap = bootstrap
server, err := NewServer(config)
if err != nil {
t.Fatalf("err: %v", err)