support [] in IgnoringTopFunction function signatures (#851)

* support [] in IgnoringTopFunction function signatures

Author: sheidkamp

gleak/ignoring_top_function.go

@@ -25,9 +25,9 @@ import (
 // matches a goroutine where the name of the top function is "foo.bar" and the
 // goroutine's state starts with "running".
 func IgnoringTopFunction(topfname string) types.GomegaMatcher {
-	if brIndex := strings.Index(topfname, "["); brIndex >= 0 {
-		expectedState := strings.Trim(topfname[brIndex:], "[]")
-		expectedTopFunction := strings.Trim(topfname[:brIndex], " ")
+	if brIndex := strings.Index(topfname, " ["); brIndex >= 0 {
+		expectedState := strings.Trim(topfname[brIndex+1:], "[]")
+		expectedTopFunction := strings.Trim(topfname[:brIndex+1], " ")
 		return &ignoringTopFunctionMatcher{
 			expectedTopFunction: expectedTopFunction,
 			expectedState:       expectedState,

gleak/ignoring_top_function_test.go

@@ -20,6 +20,14 @@ var _ = Describe("IgnoringTopFunction matcher", func() {
 		Expect(m.Match(Goroutine{
 			TopFunction: "main.main",
 		})).To(BeFalse())
+
+		m = IgnoringTopFunction("foo.bar(*implementation[...]).baz")
+		Expect(m.Match(Goroutine{
+			TopFunction: "foo.bar(*implementation[...]).baz",
+		})).To(BeTrue())
+		Expect(m.Match(Goroutine{
+			TopFunction: "main.main",
+		})).To(BeFalse())
 	})
 
 	It("matches a toplevel function by prefix", func() {
@@ -33,6 +41,17 @@ var _ = Describe("IgnoringTopFunction matcher", func() {
 		Expect(m.Match(Goroutine{
 			TopFunction: "spanish.inquisition",
 		})).To(BeFalse())
+
+		m = IgnoringTopFunction("foo.bar(*implementation[...])...")
+		Expect(m.Match(Goroutine{
+			TopFunction: "foo.bar(*implementation[...]).baz",
+		})).To(BeTrue())
+		Expect(m.Match(Goroutine{
+			TopFunction: "foo",
+		})).To(BeFalse())
+		Expect(m.Match(Goroutine{
+			TopFunction: "spanish.inquisition",
+		})).To(BeFalse())
 	})
 
 	It("matches a toplevel function by name and state prefix", func() {
@@ -45,6 +64,16 @@ var _ = Describe("IgnoringTopFunction matcher", func() {
 			TopFunction: "foo.bar",
 			State:       "uneasy, anxious",
 		})).To(BeFalse())
+
+		m = IgnoringTopFunction("foo.bar(*implementation[...]) [worried]")
+		Expect(m.Match(Goroutine{
+			TopFunction: "foo.bar(*implementation[...])",
+			State:       "worried, stalled",
+		})).To(BeTrue())
+		Expect(m.Match(Goroutine{
+			TopFunction: "foo.bar(*implementation[...])",
+			State:       "uneasy, anxious",
+		})).To(BeFalse())
 	})
 
 	It("returns failure messages", func() {