lib/util: Add caller info to service (ref #5932) (#5973)

lib/util/utils_test.go

@@ -6,7 +6,10 @@
 
 package util
 
-import "testing"
+import (
+	"strings"
+	"testing"
+)
 
 type Defaulter struct {
 	Value string
@@ -222,3 +225,20 @@ func TestCopyMatching(t *testing.T) {
 		t.Error("NoCopy")
 	}
 }
+
+func TestUtilStopTwicePanic(t *testing.T) {
+	s := AsService(func(stop chan struct{}) {
+		<-stop
+	})
+
+	go s.Serve()
+	s.Stop()
+
+	defer func() {
+		expected := "lib/util.TestUtilStopTwicePanic"
+		if r := recover(); r == nil || !strings.Contains(r.(string), expected) {
+			t.Fatalf(`expected panic containing "%v", got "%v"`, expected, r)
+		}
+	}()
+	s.Stop()
+}