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

Improve the use of goleak in unit tests #72

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Improve the use of goleak in unit tests #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 0 additions & 43 deletions client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ import (
"time"

"github.com/armon/go-socks5"
"go.uber.org/goleak"
)

func TestHTTPClient(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -94,8 +91,6 @@ func TestHTTPClient(t *testing.T) {
}

func TestHTTPClientContextCancellation(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -186,8 +181,6 @@ func TestHTTPClientContextCancellation(t *testing.T) {
}

func TestHTTPClientTLSHandshakeTimeout(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -280,8 +273,6 @@ func TestHTTPClientTLSHandshakeTimeout(t *testing.T) {
}

func TestHTTPClientServerClosingConnection(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -367,8 +358,6 @@ func TestHTTPClientServerClosingConnection(t *testing.T) {
}

func TestHTTPClientDNSFailure(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -423,8 +412,6 @@ func TestHTTPClientDNSFailure(t *testing.T) {
}

func TestHTTPClientWithProxy(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -524,8 +511,6 @@ func TestHTTPClientWithProxy(t *testing.T) {
}

func TestHTTPClientConcurrent(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
concurrency = 256
Expand Down Expand Up @@ -608,8 +593,6 @@ func TestHTTPClientConcurrent(t *testing.T) {
}

func TestHTTPClientMultiWARCWriters(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
concurrency = 256
Expand Down Expand Up @@ -698,8 +681,6 @@ func TestHTTPClientMultiWARCWriters(t *testing.T) {
}

func TestHTTPClientLocalDedupe(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -782,8 +763,6 @@ func TestHTTPClientLocalDedupe(t *testing.T) {
}

func TestHTTPClientRemoteDedupe(t *testing.T) {
defer goleak.VerifyNone(t)

var (
dedupePath = "/web/timemap/cdx"
dedupeResp = "org,wikimedia,upload)/wikipedia/commons/5/55/blason_ville_fr_sarlat-la-can%c3%a9da_(dordogne).svg 20220320002518 https://upload.wikimedia.org/wikipedia/commons/5/55/Blason_ville_fr_Sarlat-la-Can%C3%A9da_%28Dordogne%29.svg image/svg+xml 200 UIRWL5DFIPQ4MX3D3GFHM2HCVU3TZ6I3 13974"
Expand Down Expand Up @@ -878,8 +857,6 @@ func TestHTTPClientRemoteDedupe(t *testing.T) {
}

func TestHTTPClientDedupeEmptyPayload(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -962,8 +939,6 @@ func TestHTTPClientDedupeEmptyPayload(t *testing.T) {
}

func TestHTTPClientDisallow429(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -1038,8 +1013,6 @@ func TestHTTPClientDisallow429(t *testing.T) {
}

func TestHTTPClientPayloadLargerThan2MB(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -1108,8 +1081,6 @@ func TestHTTPClientPayloadLargerThan2MB(t *testing.T) {
}

func TestConcurrentHTTPClientPayloadLargerThan2MB(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
err error
Expand Down Expand Up @@ -1197,8 +1168,6 @@ func TestConcurrentHTTPClientPayloadLargerThan2MB(t *testing.T) {
}

func TestHTTPClientWithSelfSignedCertificate(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -1267,8 +1236,6 @@ func TestHTTPClientWithSelfSignedCertificate(t *testing.T) {
}

func TestWARCWritingWithDisallowedCertificate(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -1340,8 +1307,6 @@ func TestWARCWritingWithDisallowedCertificate(t *testing.T) {
}

func TestHTTPClientFullOnDisk(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
err error
Expand Down Expand Up @@ -1409,8 +1374,6 @@ func TestHTTPClientFullOnDisk(t *testing.T) {
}

func TestHTTPClientWithoutIoCopy(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -1485,8 +1448,6 @@ func TestHTTPClientWithoutIoCopy(t *testing.T) {
}

func TestHTTPClientWithoutChunkEncoding(t *testing.T) {
defer goleak.VerifyNone(t)

var (
rotatorSettings = NewRotatorSettings()
errWg sync.WaitGroup
Expand Down Expand Up @@ -1725,8 +1686,6 @@ func setupIPv6Server(t *testing.T) (string, func()) {
}

func TestHTTPClientWithIPv4Disabled(t *testing.T) {
defer goleak.VerifyNone(t)

ipv4URL, closeIPv4 := setupIPv4Server(t)
defer closeIPv4()

Expand Down Expand Up @@ -1777,8 +1736,6 @@ func TestHTTPClientWithIPv4Disabled(t *testing.T) {
}

func TestHTTPClientWithIPv6Disabled(t *testing.T) {
defer goleak.VerifyNone(t)

ipv4URL, closeIPv4 := setupIPv4Server(t)
defer closeIPv4()

Expand Down
11 changes: 0 additions & 11 deletions dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"time"

"github.com/miekg/dns"
"go.uber.org/goleak"
)

const (
Expand Down Expand Up @@ -70,8 +69,6 @@ func setup(t *testing.T) (*customDialer, *CustomHTTPClient, func()) {
}

func TestNoDNSServersConfigured(t *testing.T) {
defer goleak.VerifyNone(t)

d, _, cleanup := setup(t)
defer cleanup()

Expand All @@ -84,8 +81,6 @@ func TestNoDNSServersConfigured(t *testing.T) {
}

func TestNormalDNSResolution(t *testing.T) {
defer goleak.VerifyNone(t)

d, _, cleanup := setup(t)
defer cleanup()

Expand All @@ -106,8 +101,6 @@ func TestNormalDNSResolution(t *testing.T) {
}

func TestIPv6Only(t *testing.T) {
defer goleak.VerifyNone(t)

d, _, cleanup := setup(t)
defer cleanup()

Expand All @@ -123,8 +116,6 @@ func TestIPv6Only(t *testing.T) {
}

func TestNXDOMAIN(t *testing.T) {
defer goleak.VerifyNone(t)

d, _, cleanup := setup(t)
defer cleanup()

Expand All @@ -135,8 +126,6 @@ func TestNXDOMAIN(t *testing.T) {
}

func TestDNSFallback(t *testing.T) {
defer goleak.VerifyNone(t)

d, _, cleanup := setup(t)
defer cleanup()

Expand Down
4 changes: 0 additions & 4 deletions header_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ package warc

import (
"testing"

"go.uber.org/goleak"
)

// Tests for the Header methods and NewHeader
func TestHeaderMethods(t *testing.T) {
defer goleak.VerifyNone(t)

rotatorSettings := NewRotatorSettings()

rotatorSettings.WarcinfoContent.Set("test-header", "test-value")
Expand Down
12 changes: 12 additions & 0 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package warc

import (
"testing"

"go.uber.org/goleak"
)

// Verify leaks in ALL package tests.
func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
}
4 changes: 0 additions & 4 deletions read_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"os"
"strings"
"testing"

"go.uber.org/goleak"
)

func testFileHash(t *testing.T, path string) {
Expand Down Expand Up @@ -289,8 +287,6 @@ func testFileEarlyEOF(t *testing.T, path string) {
}

func TestReader(t *testing.T) {
defer goleak.VerifyNone(t)

var paths = []string{
"testdata/test.warc.gz",
}
Expand Down
8 changes: 0 additions & 8 deletions utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ package warc
import (
"bytes"
"testing"

"go.uber.org/goleak"
)

// Tests for the GetSHA1 function
func TestGetSHA1(t *testing.T) {
defer goleak.VerifyNone(t)

helloWorldSHA1 := "FKXGYNOJJ7H3IFO35FPUBC445EPOQRXN"

if GetSHA1(bytes.NewReader([]byte("hello world"))) != helloWorldSHA1 {
Expand All @@ -20,8 +16,6 @@ func TestGetSHA1(t *testing.T) {

// Tests for the NewRotatorSettings function
func TestNewRotatorSettings(t *testing.T) {
defer goleak.VerifyNone(t)

rotatorSettings := NewRotatorSettings()

if rotatorSettings.Prefix != "WARC" {
Expand All @@ -47,8 +41,6 @@ func TestNewRotatorSettings(t *testing.T) {

// Tests for the isLineStartingWithHTTPMethod function
func TestIsHTTPRequest(t *testing.T) {
defer goleak.VerifyNone(t)

goodHTTPRequestHeaders := []string{
"GET /index.html HTTP/1.1\r",
"POST /api/login HTTP/1.1\r",
Expand Down
Loading