pillar/devicenetwork: goroutine leak test

use fancy uber leak checker to check for leaks which have been fixed in the commit before Signed-off-by: Christoph Ostarek <[email protected]> (cherry picked from commit 145e98e)
lf-edge · Nov 6, 2024 · 6858178 · 6858178
1 parent 83340c9
commit 6858178
Show file tree

Hide file tree

Showing 19 changed files with 1,063 additions and 2 deletions.
diff --git a/pkg/pillar/devicenetwork/dns.go b/pkg/pillar/devicenetwork/dns.go
@@ -174,7 +174,10 @@ func ResolveWithPortsLambda(domain string,
 		close(wgChan)
 	}()
 
-	defer close(quit)
+	defer func() {
+		close(quit)
+		<-wgChan
+	}()
 	select {
 	case <-wgChan:
 		var responses []DNSResponse

diff --git a/pkg/pillar/devicenetwork/dns_test.go b/pkg/pillar/devicenetwork/dns_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/lf-edge/eve/pkg/pillar/devicenetwork"
 	"github.com/lf-edge/eve/pkg/pillar/netmonitor"
 	"github.com/lf-edge/eve/pkg/pillar/types"
+	"go.uber.org/goleak"
 )
 
 func createNetmonitorMockInterface() []netmonitor.MockInterface {
@@ -161,7 +162,7 @@ func TestDnsResolveTimeout(t *testing.T) {
 }
 
 func TestResolveWithPortsLambda(t *testing.T) {
-	t.Parallel()
+	defer goleak.VerifyNone(t, goleak.IgnoreAnyFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreCurrent())
 
 	expectedIP := net.IP{1, 2, 3, 4}
 

diff --git a/pkg/pillar/go.mod b/pkg/pillar/go.mod
@@ -210,6 +210,7 @@ require (
 	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	go.uber.org/goleak v1.3.0 // indirect
 	k8s.io/apiextensions-apiserver v0.28.1 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect

diff --git a/pkg/pillar/go.sum b/pkg/pillar/go.sum
@@ -1997,6 +1997,8 @@ go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=

diff --git a/pkg/pillar/vendor/go.uber.org/goleak/.gitignore b/pkg/pillar/vendor/go.uber.org/goleak/.gitignore
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/.golangci.yml b/pkg/pillar/vendor/go.uber.org/goleak/.golangci.yml
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/CHANGELOG.md b/pkg/pillar/vendor/go.uber.org/goleak/CHANGELOG.md
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/LICENSE b/pkg/pillar/vendor/go.uber.org/goleak/LICENSE
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/Makefile b/pkg/pillar/vendor/go.uber.org/goleak/Makefile
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/README.md b/pkg/pillar/vendor/go.uber.org/goleak/README.md
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/doc.go b/pkg/pillar/vendor/go.uber.org/goleak/doc.go
diff --git a/pkg/pillar/vendor/go.uber.org/goleak/internal/stack/doc.go b/pkg/pillar/vendor/go.uber.org/goleak/internal/stack/doc.go