From d6480dacd6e0af39b81cdcfc6a009576a4ea0c04 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 19 Jan 2023 08:26:05 +0100 Subject: [PATCH] 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 $. --- .../src/k8s.io/component-base/logs/api/v1/options_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/component-base/logs/api/v1/options_test.go b/staging/src/k8s.io/component-base/logs/api/v1/options_test.go index 2597d8797a0..d70fdda2e8d 100644 --- a/staging/src/k8s.io/component-base/logs/api/v1/options_test.go +++ b/staging/src/k8s.io/component-base/logs/api/v1/options_test.go @@ -114,11 +114,11 @@ func TestFlagSet(t *testing.T) { // --log-flush-frequency duration Maximum number of seconds between log flushes (default 5s) // -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) - assert.Regexp(t, `.*--logging-format.*default.*text.* + assert.Regexp(t, `^.*--logging-format.*default.*text.* .*--log-flush-frequency.*default 5s.* .*-v.*--v.* .*--vmodule.*pattern=N.* -`, buffer.String()) +$`, buffer.String()) }) t.Run("flag", func(t *testing.T) { @@ -141,7 +141,7 @@ func TestFlagSet(t *testing.T) { // number for the log level verbosity // -vmodule value // 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.* .*-logging-format.* .*default.*text.* @@ -149,7 +149,7 @@ func TestFlagSet(t *testing.T) { .* .*-vmodule.* .* -`, buffer.String()) +$`, buffer.String()) }) }