Skip to content

Commit be720f1

Browse files
author
guzel.gatina
committed
replace map on testPhaseObjects to sync.Map
1 parent 5732d4a commit be720f1

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

init.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package allure
22

33
import (
4-
"github.com/jtolds/gls"
54
"sync"
5+
6+
"github.com/jtolds/gls"
67
)
78

89
var (
@@ -11,7 +12,7 @@ var (
1112
resultsPath string
1213
createFolderOnce sync.Once
1314
copyEnvFileOnce sync.Once
14-
testPhaseObjects map[string]*testPhaseContainer
15+
testPhaseObjects sync.Map
1516
)
1617

1718
const (
@@ -25,5 +26,5 @@ const (
2526

2627
func init() {
2728
ctxMgr = gls.NewContextManager()
28-
testPhaseObjects = make(map[string]*testPhaseContainer)
29+
testPhaseObjects = sync.Map{}
2930
}

test_phase_container.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,11 @@ func (sc *subContainer) getStatus() string {
112112
}
113113

114114
func getCurrentTestPhaseObject(t *testing.T) *testPhaseContainer {
115-
var currentPhaseObject *testPhaseContainer
116-
if phaseContainer, ok := testPhaseObjects[t.Name()]; ok {
117-
currentPhaseObject = phaseContainer
118-
} else {
119-
currentPhaseObject = &testPhaseContainer{
120-
Befores: make([]*container, 0),
121-
Afters: make([]*container, 0),
122-
}
123-
testPhaseObjects[t.Name()] = currentPhaseObject
124-
}
125-
126-
return currentPhaseObject
115+
phaseContainer, _ := testPhaseObjects.LoadOrStore(t.Name(), &testPhaseContainer{
116+
Befores: make([]*container, 0),
117+
Afters: make([]*container, 0),
118+
})
119+
return phaseContainer.(*testPhaseContainer)
127120
}
128121

129122
func (c container) writeResultsFile() error {

0 commit comments

Comments
 (0)