kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

testutil: fix boostrap mode after flag change

Browse Source
This commit is contained in:
Ryan Uber
2015-09-24 21:16:52 -07:00
parent 13613e4100
commit 7a6e633028
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
testutil/server.go
View File

@@ -50,8 +50,8 @@ type PortsConfig struct {
// ServerConfig is used to configure the nomad server.
type ServerConfig struct {
Enabled bool `json:"enabled"`
Bootstrap bool `json:"bootstrap"`
Enabled bool `json:"enabled"`
BootstrapExpect int `json:"bootstrap_expect"`
}
// ClientConfig is used to configure the client
@@ -78,8 +78,8 @@ func defaultServerConfig() *TestServerConfig {
Serf: 22000 + idx,
},
Server: &ServerConfig{
Enabled: true,
Bootstrap: true,
Enabled: true,
BootstrapExpect: 1,
},
Client: &ClientConfig{
Enabled: false,
@@ -170,7 +170,7 @@ func NewTestServer(t *testing.T, cb ServerConfigCallback) *TestServer {
}
// Wait for the server to be ready
if nomadConfig.Server.Enabled && nomadConfig.Server.Bootstrap {
if nomadConfig.Server.Enabled && nomadConfig.Server.BootstrapExpect != 0 {
server.waitForLeader()
} else {
server.waitForAPI()