Merge pull request #115195 from pohly/log-go-flag-support

k8s.io/component-base/logs: match full help text in unit test
This commit is contained in:
Kubernetes Prow Robot 2023-01-20 01:22:16 -08:00 committed by GitHub
commit 325bb26823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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