luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

test: use UniqueID prefix for check tests to unify log output

Browse source
This commit is contained in:
Frank Schroeder 2017-05-23 16:04:26 +02:00
parent 828f40054a
commit dc1548af06
No known key found for this signature in database
GPG key ID: 4D65C6EAEC87DECD
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
command/agent/check_test.go
View file

@ -28,7 +28,7 @@ func expectStatus(t *testing.T, script, status string) {
CheckID: types.CheckID("foo"),
Script: script,
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -71,7 +71,7 @@ func TestCheckMonitor_Timeout(t *testing.T) {
Script: "sleep 1 && exit 0",
Interval: 10 * time.Millisecond,
Timeout: 5 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -95,7 +95,7 @@ func TestCheckMonitor_RandomStagger(t *testing.T) {
CheckID: types.CheckID("foo"),
Script: "exit 0",
Interval: 25 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -120,7 +120,7 @@ func TestCheckMonitor_LimitOutput(t *testing.T) {
CheckID: types.CheckID("foo"),
Script: "od -N 81920 /dev/urandom",
Interval: 25 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -140,7 +140,7 @@ func TestCheckTTL(t *testing.T) {
Notify: notif,
CheckID: types.CheckID("foo"),
TTL: 100 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -211,7 +211,7 @@ func expectHTTPStatus(t *testing.T, url string, status string) {
CheckID: types.CheckID("foo"),
HTTP: url,
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -307,7 +307,7 @@ func TestCheckHTTPTimeout(t *testing.T) {
HTTP: server.URL,
Timeout: 5 * time.Millisecond,
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
@ -328,7 +328,7 @@ func TestCheckHTTP_disablesKeepAlives(t *testing.T) {
CheckID: types.CheckID("foo"),
HTTP: "http://foo.bar/baz",
Interval: 10 * time.Second,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
@ -345,7 +345,7 @@ func TestCheckHTTP_TLSSkipVerify_defaultFalse(t *testing.T) {
CheckID: "foo",
HTTP: "https://foo.bar/baz",
Interval: 10 * time.Second,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
@ -368,7 +368,7 @@ func TestCheckHTTP_TLSSkipVerify_true_pass(t *testing.T) {
CheckID: types.CheckID("skipverify_true"),
HTTP: server.URL,
Interval: 5 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
TLSSkipVerify: true,
}
@ -397,7 +397,7 @@ func TestCheckHTTP_TLSSkipVerify_true_fail(t *testing.T) {
CheckID: types.CheckID("skipverify_true"),
HTTP: server.URL,
Interval: 5 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
TLSSkipVerify: true,
}
check.Start()
@ -425,7 +425,7 @@ func TestCheckHTTP_TLSSkipVerify_false(t *testing.T) {
CheckID: types.CheckID("skipverify_false"),
HTTP: server.URL,
Interval: 100 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
TLSSkipVerify: false,
}
@ -472,7 +472,7 @@ func expectTCPStatus(t *testing.T, tcp string, status string) {
CheckID: types.CheckID("foo"),
TCP: tcp,
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
}
check.Start()
defer check.Stop()
@ -649,7 +649,7 @@ func expectDockerCheckStatus(t *testing.T, dockerClient DockerClient, status str
DockerContainerID: "54432bad1fc7",
Shell: "/bin/sh",
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
dockerClient: dockerClient,
}
check.Start()
@ -711,7 +711,7 @@ func TestDockerCheckDefaultToSh(t *testing.T) {
Script: "/health.sh",
DockerContainerID: "54432bad1fc7",
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
dockerClient: &fakeDockerClientWithNoErrors{},
}
check.Start()
@ -733,7 +733,7 @@ func TestDockerCheckUseShellFromEnv(t *testing.T) {
Script: "/health.sh",
DockerContainerID: "54432bad1fc7",
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
dockerClient: &fakeDockerClientWithNoErrors{},
}
check.Start()
@ -756,7 +756,7 @@ func TestDockerCheckTruncateOutput(t *testing.T) {
DockerContainerID: "54432bad1fc7",
Shell: "/bin/sh",
Interval: 10 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags),
Logger: log.New(os.Stderr, UniqueID(), log.LstdFlags),
dockerClient: &fakeDockerClientWithLongOutput{},
}
check.Start()