gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate temporary test files and directories

Browse Source 
Currently, temporary test files and directories are written in lots of
different paths within the OS's temp dir. This makes it hard to know
which files are from nats-server and which are unrelated. This in turn
makes it hard to clean up nats-server test files.
This commit is contained in:
Jaime Piña
2021-04-02 10:43:34 -07:00
parent 3c50623f0c
commit e44275b963
20 changed files with 190 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
logger/log_test.go
View File

@@ -26,6 +26,8 @@ import (
"testing"
)
var tempRoot = filepath.Join(os.TempDir(), "nats-server")
func TestStdLogger(t *testing.T) {
logger := NewStdLogger(false, false, false, false, false)
@@ -103,16 +105,10 @@ func TestStdLoggerTraceWithOutDebug(t *testing.T) {
}
func TestFileLogger(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "_nats-server")
if err != nil {
t.Fatal("Could not create tmp dir")
}
tmpDir := createDir(t, "_nats-server")
defer os.RemoveAll(tmpDir)
file, err := ioutil.TempFile(tmpDir, "nats-server:log_")
if err != nil {
t.Fatalf("Could not create the temp file: %v", err)
}
file := createFileAtDir(t, tmpDir, "nats-server:log_")
file.Close()
logger := NewFileLogger(file.Name(), false, false, false, false)
@@ -131,10 +127,7 @@ func TestFileLogger(t *testing.T) {
t.Fatalf("Expected '%s', received '%s'\n", "[INFO] foo", string(buf))
}
file, err = ioutil.TempFile(tmpDir, "nats-server:log_")
if err != nil {
t.Fatalf("Could not create the temp file: %v", err)
}
file = createFileAtDir(t, tmpDir, "nats-server:log_")
file.Close()
logger = NewFileLogger(file.Name(), true, true, true, true)
@@ -184,16 +177,10 @@ func TestFileLoggerSizeLimit(t *testing.T) {
}
logger.Close()
tmpDir, err := ioutil.TempDir("", "nats-server")
if err != nil {
t.Fatal("Could not create tmp dir")
}
tmpDir := createDir(t, "nats-server")
defer os.RemoveAll(tmpDir)
file, err := ioutil.TempFile(tmpDir, "log_")
if err != nil {
t.Fatalf("Could not create the temp file: %v", err)
}
file := createFileAtDir(t, tmpDir, "log_")
file.Close()
logger = NewFileLogger(file.Name(), true, false, false, true)
@@ -226,17 +213,11 @@ func TestFileLoggerSizeLimit(t *testing.T) {
// Remove all files
os.RemoveAll(tmpDir)
tmpDir, err = ioutil.TempDir("", "nats-server")
if err != nil {
t.Fatal("Could not create tmp dir")
}
tmpDir = createDir(t, "nats-server")
defer os.RemoveAll(tmpDir)
// Recreate logger and don't set a limit
file, err = ioutil.TempFile(tmpDir, "log_")
if err != nil {
t.Fatalf("Could not create the temp file: %v", err)
}
file = createFileAtDir(t, tmpDir, "log_")
file.Close()
logger = NewFileLogger(file.Name(), true, false, false, true)
defer logger.Close()
@@ -344,3 +325,24 @@ func expectOutput(t *testing.T, f func(), expected string) {
t.Fatalf("Expected '%s', received '%s'\n", expected, out)
}
}
func createDir(t *testing.T, prefix string) string {
t.Helper()
if err := os.MkdirAll(tempRoot, 0700); err != nil {
t.Fatal(err)
}
dir, err := ioutil.TempDir(tempRoot, prefix)
if err != nil {
t.Fatal(err)
}
return dir
}
func createFileAtDir(t *testing.T, dir, prefix string) *os.File {
t.Helper()
f, err := ioutil.TempFile(dir, prefix)
if err != nil {
t.Fatal(err)
}
return f
}