From 35005b880d4b06412565d37bd9f3f9f33f93a907 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 09:28:21 +0000
Subject: [PATCH 1/2] build(deps): bump go.uber.org/goleak

Bumps [go.uber.org/goleak](https://github.com/uber-go/goleak) from 1.2.2-0.20230213210001-751da596f6f7 to 1.3.0.
- [Release notes](https://github.com/uber-go/goleak/releases)
- [Changelog](https://github.com/uber-go/goleak/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber-go/goleak/commits/v1.3.0)

---
updated-dependencies:
- dependency-name: go.uber.org/goleak
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 0e1bc2838..f33e96d13 100644
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/testcontainers/testcontainers-go v0.12.0
 	github.com/urfave/cli v1.22.12
 	go.opencensus.io v0.24.0
-	go.uber.org/goleak v1.2.2-0.20230213210001-751da596f6f7
+	go.uber.org/goleak v1.3.0
 	golang.org/x/net v0.17.0
 	google.golang.org/grpc v1.54.0
 	pgregory.net/rapid v1.1.0
diff --git a/go.sum b/go.sum
index b598fedb5..bf2882df1 100644
--- a/go.sum
+++ b/go.sum
@@ -833,8 +833,8 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
-go.uber.org/goleak v1.2.2-0.20230213210001-751da596f6f7 h1:cnmZW/hz/FJAWBKyZlR57sJRY5htWrQbrykbUbJSbeI=
-go.uber.org/goleak v1.2.2-0.20230213210001-751da596f6f7/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/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

From a25383d9c799732558e3171da1fa0a25896c012a Mon Sep 17 00:00:00 2001
From: Thom Shutt <thomshutt@users.noreply.github.com>
Date: Wed, 13 Dec 2023 09:51:27 +0000
Subject: [PATCH 2/2] Fix compilation error

---
 server/mediaserver_test.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/mediaserver_test.go b/server/mediaserver_test.go
index 585bb778f..3b02ea671 100644
--- a/server/mediaserver_test.go
+++ b/server/mediaserver_test.go
@@ -1224,10 +1224,8 @@ func TestRegisterConnection(t *testing.T) {
 
 func TestBroadcastSessionManagerWithStreamStartStop(t *testing.T) {
 	goleakOptions := common.IgnoreRoutines()
-	// allow enough time for the transcode end goroutines to finish
-	goleakOptions = append(goleakOptions, goleak.MaxSleepInterval(5*time.Second), goleak.MaxRetryAttempts(1000))
 	defer goleak.VerifyNone(t, goleakOptions...)
-	assert := assert.New(t)
+	assert := require.New(t)
 
 	s, cancel := setupServerWithCancel()
 	defer func() {