As we reevaluate how to best support and maintain Staging Ref in the future, we encourage development teams using this environment to highlight their use cases in the following issue: https://gitlab.com/gitlab-com/gl-infra/software-delivery/framework/software-delivery-framework-issue-tracker/-/issues/36.

Skip to content
Snippets Groups Projects
Unverified Commit 0dbe3891 authored by Ash McKenzie's avatar Ash McKenzie
Browse files

Extract temp file creation into createTempFile()

parent 71927c6e
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -12,12 +12,10 @@ import (
)
func TestConfigure(t *testing.T) {
tmpFile, err := os.CreateTemp(os.TempDir(), "logtest-")
require.NoError(t, err)
defer tmpFile.Close()
tmpFile := createTempFile(t)
config := config.Config{
LogFile: tmpFile.Name(),
LogFile: tmpFile,
LogFormat: "json",
}
Loading
Loading
@@ -27,9 +25,7 @@ func TestConfigure(t *testing.T) {
log.Info("this is a test")
log.WithFields(log.Fields{}).Debug("debug log message")
tmpFile.Close()
data, err := os.ReadFile(tmpFile.Name())
data, err := os.ReadFile(tmpFile)
dataStr := string(data)
require.NoError(t, err)
require.Contains(t, dataStr, `"msg":"this is a test"`)
Loading
Loading
@@ -38,12 +34,10 @@ func TestConfigure(t *testing.T) {
}
func TestConfigureWithDebugLogLevel(t *testing.T) {
tmpFile, err := os.CreateTemp(os.TempDir(), "logtest-")
require.NoError(t, err)
defer tmpFile.Close()
tmpFile := createTempFile(t)
config := config.Config{
LogFile: tmpFile.Name(),
LogFile: tmpFile,
LogFormat: "json",
LogLevel: "debug",
}
Loading
Loading
@@ -53,9 +47,7 @@ func TestConfigureWithDebugLogLevel(t *testing.T) {
log.WithFields(log.Fields{}).Debug("debug log message")
tmpFile.Close()
data, err := os.ReadFile(tmpFile.Name())
data, err := os.ReadFile(tmpFile)
require.NoError(t, err)
require.Contains(t, string(data), `msg":"debug log message"`)
}
Loading
Loading
@@ -75,13 +67,10 @@ func TestConfigureWithPermissionError(t *testing.T) {
}
func TestLogInUTC(t *testing.T) {
tmpFile, err := os.CreateTemp(os.TempDir(), "logtest-")
require.NoError(t, err)
defer tmpFile.Close()
defer os.Remove(tmpFile.Name())
tmpFile := createTempFile(t)
config := config.Config{
LogFile: tmpFile.Name(),
LogFile: tmpFile,
LogFormat: "json",
}
Loading
Loading
@@ -90,7 +79,7 @@ func TestLogInUTC(t *testing.T) {
log.Info("this is a test")
data, err := os.ReadFile(tmpFile.Name())
data, err := os.ReadFile(tmpFile)
require.NoError(t, err)
utc := `[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z`
Loading
Loading
@@ -99,3 +88,13 @@ func TestLogInUTC(t *testing.T) {
require.NoError(t, e)
require.True(t, r)
}
func createTempFile(t *testing.T) string {
t.Helper()
tmpFile, err := os.CreateTemp(t.TempDir(), "logtest-")
require.NoError(t, err)
tmpFile.Close()
return tmpFile.Name()
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment