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

mock: move regexp compilation outside of Called #631

Merged
merged 3 commits into from
Aug 1, 2023
+5 −3
Merged

mock: move regexp compilation outside of Called #631

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da5c2f0
Move regexp compilation outside of the function
aud10slave Jul 11, 2018
60dbca7
Merge branch 'master' into master
dolmen Jul 31, 2023
17c185c
mock: review fixed in Called
dolmen Jul 31, 2023
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
6 changes: 4 additions & 2 deletions mock/mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import (
"github.com/stretchr/testify/assert"
)

// regex for GCCGO functions
var gccgoRE = regexp.MustCompile("\\.pN\\d+_")
dolmen marked this conversation as resolved.
Show resolved Hide resolved

// TestingT is an interface wrapper around *testing.T
type TestingT interface {
Logf(format string, args ...interface{})
Expand Down Expand Up @@ -455,8 +458,7 @@ func (m *Mock) Called(arguments ...interface{}) Arguments {
// For Ex: github_com_docker_libkv_store_mock.WatchTree.pN39_github_com_docker_libkv_store_mock.Mock
// uses interface information unlike golang github.com/docker/libkv/store/mock.(*Mock).WatchTree
// With GCCGO we need to remove interface information starting from pN<dd>.
re := regexp.MustCompile("\\.pN\\d+_")
if re.MatchString(functionPath) {
if gccgoRE.MatchString(functionPath) {
functionPath = re.Split(functionPath, -1)[0]
dolmen marked this conversation as resolved.
Show resolved Hide resolved
}
parts := strings.Split(functionPath, ".")
Expand Down