From 6c77a307b9eb4fa04dea46cb03c094c42c4936af Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-vault-core <82990506+hc-github-team-secure-vault-core@users.noreply.github.com> Date: Thu, 9 May 2024 09:14:09 -0700 Subject: [PATCH] Add NewTestLoggerWithSuffix for tests that need multiple log files. (#26879) (#26897) Co-authored-by: Victor Rodriguez --- helper/testhelpers/corehelpers/corehelpers.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/helper/testhelpers/corehelpers/corehelpers.go b/helper/testhelpers/corehelpers/corehelpers.go index cae4d5b019d4..e3071653b5b1 100644 --- a/helper/testhelpers/corehelpers/corehelpers.go +++ b/helper/testhelpers/corehelpers/corehelpers.go @@ -543,13 +543,20 @@ type TestLogger struct { } func NewTestLogger(t testing.T) *TestLogger { + return NewTestLoggerWithSuffix(t, "") +} + +func NewTestLoggerWithSuffix(t testing.T, logFileSuffix string) *TestLogger { var logFile *os.File var logPath string output := os.Stderr logDir := os.Getenv("VAULT_TEST_LOG_DIR") if logDir != "" { - logPath = filepath.Join(logDir, t.Name()+".log") + if logFileSuffix != "" && !strings.HasPrefix(logFileSuffix, "_") { + logFileSuffix = "_" + logFileSuffix + } + logPath = filepath.Join(logDir, t.Name()+logFileSuffix+".log") // t.Name may include slashes. dir, _ := filepath.Split(logPath) err := os.MkdirAll(dir, 0o755)