mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
k8s.io/component-base/logs: match full help text in unit test
The test was meant to fail when there are unexpected additional lines like the "panic calling String method" messages. But `assert.Regexp` does a search for the regexp, not a full string match, and thus succeeded even if those lines are present. A full match needs to be requested explicitly with ^ and $.
This commit is contained in:
parent
4add08dcce
commit
d6480dacd6
@ -114,11 +114,11 @@ func TestFlagSet(t *testing.T) {
|
|||||||
// --log-flush-frequency duration Maximum number of seconds between log flushes (default 5s)
|
// --log-flush-frequency duration Maximum number of seconds between log flushes (default 5s)
|
||||||
// -v, --v Level number for the log level verbosity
|
// -v, --v Level number for the log level verbosity
|
||||||
// --vmodule pattern=N,... comma-separated list of pattern=N settings for file-filtered logging (only works for text log format)
|
// --vmodule pattern=N,... comma-separated list of pattern=N settings for file-filtered logging (only works for text log format)
|
||||||
assert.Regexp(t, `.*--logging-format.*default.*text.*
|
assert.Regexp(t, `^.*--logging-format.*default.*text.*
|
||||||
.*--log-flush-frequency.*default 5s.*
|
.*--log-flush-frequency.*default 5s.*
|
||||||
.*-v.*--v.*
|
.*-v.*--v.*
|
||||||
.*--vmodule.*pattern=N.*
|
.*--vmodule.*pattern=N.*
|
||||||
`, buffer.String())
|
$`, buffer.String())
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("flag", func(t *testing.T) {
|
t.Run("flag", func(t *testing.T) {
|
||||||
@ -141,7 +141,7 @@ func TestFlagSet(t *testing.T) {
|
|||||||
// number for the log level verbosity
|
// number for the log level verbosity
|
||||||
// -vmodule value
|
// -vmodule value
|
||||||
// comma-separated list of pattern=N settings for file-filtered logging (only works for text log format)
|
// comma-separated list of pattern=N settings for file-filtered logging (only works for text log format)
|
||||||
assert.Regexp(t, `.*-log-flush-frequency.*
|
assert.Regexp(t, `^.*-log-flush-frequency.*
|
||||||
.*default 5s.*
|
.*default 5s.*
|
||||||
.*-logging-format.*
|
.*-logging-format.*
|
||||||
.*default.*text.*
|
.*default.*text.*
|
||||||
@ -149,7 +149,7 @@ func TestFlagSet(t *testing.T) {
|
|||||||
.*
|
.*
|
||||||
.*-vmodule.*
|
.*-vmodule.*
|
||||||
.*
|
.*
|
||||||
`, buffer.String())
|
$`, buffer.String())
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user