Skip to content

Commit

Permalink
Remove unnecessary "filepath.Join" for single element path
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahumenberger @bauersimon
ahumenberger authored and bauersimon committed Jul 12, 2024
1 parent 975d3fe commit ebc4f89
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
24 changes: 12 additions & 12 deletions evaluate/evaluate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), mockedModel.ID(), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -283,7 +283,7 @@ func TestEvaluate(t *testing.T) {
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): func(t *testing.T, filePath, data string) {
assert.Contains(t, data, ErrEmptyResponseFromModel.Error())
},
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -353,7 +353,7 @@ func TestEvaluate(t *testing.T) {
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): func(t *testing.T, filePath, data string) {
assert.Contains(t, data, "Attempt 1/3: "+ErrEmptyResponseFromModel.Error())
},
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -422,7 +422,7 @@ func TestEvaluate(t *testing.T) {
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): func(t *testing.T, filePath, data string) {
assert.Contains(t, data, "DONE 0 tests, 1 error")
},
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -548,7 +548,7 @@ func TestEvaluate(t *testing.T) {
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "next.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -649,7 +649,7 @@ func TestEvaluate(t *testing.T) {
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "next.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -715,7 +715,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -784,7 +784,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
ExpectedOutputValidate: func(t *testing.T, output string, resultPath string) {
assert.Contains(t, output, "Run 1/3")
Expand Down Expand Up @@ -856,7 +856,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
ExpectedOutputValidate: func(t *testing.T, output string, resultPath string) {
assert.Contains(t, output, "Run 1/3 for model")
Expand Down Expand Up @@ -957,7 +957,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -1041,7 +1041,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down Expand Up @@ -1107,7 +1107,7 @@ func TestEvaluate(t *testing.T) {
ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
"evaluation.log": nil,
filepath.Join(string(evaluatetask.IdentifierWriteTests), log.CleanModelNameForFileSystem(mockedModelID), "golang", "golang", "plain.log"): nil,
filepath.Join("evaluation.csv"): nil,
"evaluation.csv": nil,
},
})
}
Expand Down
13 changes: 10 additions & 3 deletions log/logger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,19 @@ func TestLoggerWith(t *testing.T) {

validate := func(t *testing.T, tc *testCase) {
t.Run(tc.Name, func(t *testing.T) {
var logger *Logger
var logOutput *bytesutil.SynchronizedBuffer
defer func() {
runtime.GC() // Trigger garbage collector such that non-used files are closed before the temporary directory is removed.
// Drop all references to the logger to ensure the garbage collector can clean it up.
logger = nil
logOutput = nil
tc.Do = nil
// Trigger garbage collection such that non-used files inside the logger are closed before the temporary directory is removed.
runtime.GC()
}()

logOutput := new(bytesutil.SynchronizedBuffer)
logger := newLoggerWithWriter(logOutput, FlagMessageOnly)
logOutput = new(bytesutil.SynchronizedBuffer)
logger = newLoggerWithWriter(logOutput, FlagMessageOnly)

temporaryPath := t.TempDir()

Expand Down

0 comments on commit ebc4f89

Please sign in to comment.