Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify TestName determination when running tests (no need for Closure) #360

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Simplify TestName determination when running tests (no need for Closure) #360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4679e8a
Empty-Commit
jasondborneman Jan 19, 2024
16ef81e
simplify getting test name when running tests (remove closure)
jasondborneman Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions example/weather/services/tester/run_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ func getStackTrace(wg *sync.WaitGroup, m *sync.Mutex) (string, error) {

// recovers from a panicked test. This is used to ensure that the test
// suite does not crash if a test panics.
func recoverFromTestPanic(ctx context.Context, testNameFunc func() string, testCollection *TestCollection) {
func recoverFromTestPanic(ctx context.Context, testName string, testCollection *TestCollection) {
if r := recover(); r != nil {
msg := fmt.Sprintf("[Panic Test]: %v", testNameFunc())
msg := fmt.Sprintf("[Panic Test]: %v", testName)
err := errors.New(msg)
log.Errorf(ctx, err, fmt.Sprintf("%v", r))
var m sync.Mutex
Expand All @@ -80,7 +80,7 @@ func recoverFromTestPanic(ctx context.Context, testNameFunc func() string, testC
resultMsg = fmt.Sprintf("%v | %v", msg, r)
}
testCollection.AppendTestResult(&gentester.TestResult{
Name: testNameFunc(),
Name: testName,
Passed: false,
Error: &resultMsg,
Duration: -1,
Expand Down Expand Up @@ -216,14 +216,9 @@ func (svc *Service) runTests(ctx context.Context, p *gentester.TesterPayload, te
wg.Add(1)
go func() {
defer wg.Done()
testName := ""
testNameFunc := func() string {
return testName
}
defer recoverFromTestPanic(ctx, testNameFunc, testCollection)
for testNameRunning, test := range testsToRun {
testName = testNameRunning
log.Infof(ctx, "RUNNING TEST [%v]", testName)
defer recoverFromTestPanic(ctx, testNameRunning, testCollection)
log.Infof(ctx, "RUNNING TEST [%v]", testNameRunning)
test(ctx, testCollection)
}
}()
Expand All @@ -237,10 +232,7 @@ func (svc *Service) runTests(ctx context.Context, p *gentester.TesterPayload, te
wg.Add(1)
go func(f func(context.Context, *TestCollection), testNameRunning string) {
defer wg.Done()
testNameFunc := func() string {
return testNameRunning
}
defer recoverFromTestPanic(ctx, testNameFunc, testCollection)
defer recoverFromTestPanic(ctx, testNameRunning, testCollection)
log.Infof(ctx, "RUNNING TEST [%v]", testNameRunning)
f(ctx, testCollection)
}(test, name)
Expand Down