GOMODULES/testify
1
0
Fork 0
mirror of https://github.com/stretchr/testify.git synced 2025-04-27 13:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147 from multiplay/master

Browse Source 
Fix race condition with ExpectedCalls
This commit is contained in:
Ernesto Jiménez 2015-06-02 14:37:00 +01:00
commit 93a84c883d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mock/mock.go
View File

@ -112,6 +112,9 @@ func (m *Mock) On(methodName string, arguments ...interface{}) *Mock {
// //
// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2) // Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2)
func (m *Mock) Return(returnArguments ...interface{}) *Mock { func (m *Mock) Return(returnArguments ...interface{}) *Mock {
m.mutex.Lock()
defer m.mutex.Unlock()
m.ExpectedCalls = append(m.ExpectedCalls, Call{m.onMethodName, m.onMethodArguments, returnArguments, 0, nil, nil}) m.ExpectedCalls = append(m.ExpectedCalls, Call{m.onMethodName, m.onMethodArguments, returnArguments, 0, nil, nil})
return m return m
} }