Skip to content

Fix flaky tests #119

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

Merged
ragaskar merged 1 commit into from
Jul 18, 2025
Merged

Fix flaky tests #119

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
233 changes: 35 additions & 198 deletions httpclient/http_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@ import (

var _ = Describe("HTTPClient", func() {
var (
httpClient *HTTPClient
server *ghttp.Server
logger loggerfakes.FakeLogger
httpClient *HTTPClient
fastErroringHttpClient *HTTPClient
server *ghttp.Server
logger loggerfakes.FakeLogger
opts Opts
)

BeforeEach(func() {
JustBeforeEach(func() {
logger = loggerfakes.FakeLogger{}

httpClient = NewHTTPClient(&http.Client{
httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
Expand All @@ -36,14 +38,33 @@ var _ = Describe("HTTPClient", func() {
Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
Timeout: 10 * time.Second,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
TLSHandshakeTimeout: 10 * time.Second,
DisableKeepAlives: true,
},
}, &logger)
}, &logger, opts)

fastErroringHttpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 1 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 1 * time.Millisecond,
DisableKeepAlives: true,
},
}, &logger, opts)

server = ghttp.NewServer()
})
Expand Down Expand Up @@ -115,46 +136,22 @@ var _ = Describe("HTTPClient", func() {
It("redacts passwords from error message", func() {
url := "http://foo:bar@10.10.0.0/path"

_, err := httpClient.PostCustomized(url, []byte("post-request"), func(r *http.Request) {})
_, err := fastErroringHttpClient.PostCustomized(url, []byte("post-request"), func(r *http.Request) {})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("http://foo:<redacted>@10.10.0.0/path"))
})

It("redacts passwords from error message for https calls", func() {
url := "https://foo:bar@10.10.0.0/path"

_, err := httpClient.PostCustomized(url, []byte("post-request"), func(r *http.Request) {})
_, err := fastErroringHttpClient.PostCustomized(url, []byte("post-request"), func(r *http.Request) {})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("https://foo:<redacted>@10.10.0.0/path"))
})

Describe("httpclient opts", func() {
var opts Opts

BeforeEach(func() {
opts = Opts{NoRedactUrlQuery: true}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("does not redact every query param from endpoint for https calls", func() {
Expand All @@ -170,28 +167,6 @@ var _ = Describe("HTTPClient", func() {
Context("httpclient has been configured to redact query parmas", func() {
BeforeEach(func() {
opts = Opts{}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("redacts every query param from endpoint for https calls", func() {
Expand Down Expand Up @@ -234,32 +209,8 @@ var _ = Describe("HTTPClient", func() {
})

Describe("httpclient opts", func() {
var opts Opts

BeforeEach(func() {
opts = Opts{NoRedactUrlQuery: true}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("does not redact every query param from endpoint for https calls", func() {
Expand All @@ -274,28 +225,6 @@ var _ = Describe("HTTPClient", func() {
Context("httpclient has been configured to redact query parmas", func() {
BeforeEach(func() {
opts = Opts{}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("redacts every query param from endpoint for https calls", func() {
Expand Down Expand Up @@ -375,46 +304,22 @@ var _ = Describe("HTTPClient", func() {
It("redacts passwords from error message", func() {
url := "http://foo:bar@10.10.0.0/path"

_, err := httpClient.PutCustomized(url, []byte("put-request"), func(r *http.Request) {})
_, err := fastErroringHttpClient.PutCustomized(url, []byte("put-request"), func(r *http.Request) {})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("http://foo:<redacted>@10.10.0.0/path"))
})

It("redacts passwords from error message for https calls", func() {
url := "https://foo:bar@10.10.0.0/path"

_, err := httpClient.PutCustomized(url, []byte("put-request"), func(r *http.Request) {})
_, err := fastErroringHttpClient.PutCustomized(url, []byte("put-request"), func(r *http.Request) {})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("https://foo:<redacted>@10.10.0.0/path"))
})

Describe("httpclient opts", func() {
var opts Opts

BeforeEach(func() {
opts = Opts{NoRedactUrlQuery: true}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("does not redact every query param from endpoint for https calls", func() {
Expand All @@ -429,28 +334,6 @@ var _ = Describe("HTTPClient", func() {
Context("httpclient has been configured to redact query parmas", func() {
BeforeEach(func() {
opts = Opts{}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("redacts every query param from endpoint for https calls", func() {
Expand Down Expand Up @@ -526,46 +409,22 @@ var _ = Describe("HTTPClient", func() {
It("redacts passwords from error message", func() {
url := "http://foo:bar@10.10.0.0/path"

_, err := httpClient.GetCustomized(url, func(r *http.Request) {})
_, err := fastErroringHttpClient.GetCustomized(url, func(r *http.Request) {})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("http://foo:<redacted>@10.10.0.0/path"))
})

It("redacts passwords from error message for https calls", func() {
url := "https://foo:bar@10.10.0.0:8080/path"

_, err := httpClient.GetCustomized(url, func(r *http.Request) {})
_, err := fastErroringHttpClient.GetCustomized(url, func(r *http.Request) {})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("https://foo:<redacted>@10.10.0.0:8080/path"))
})

Describe("httpclient opts", func() {
var opts Opts

BeforeEach(func() {
opts = Opts{NoRedactUrlQuery: true}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("does not redact every query param from endpoint for https calls", func() {
Expand All @@ -580,28 +439,6 @@ var _ = Describe("HTTPClient", func() {
Context("httpclient has been configured to redact query parmas", func() {
BeforeEach(func() {
opts = Opts{}

httpClient = NewHTTPClientOpts(&http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
RootCAs: nil,
InsecureSkipVerify: true,
},

Proxy: http.ProxyFromEnvironment,

Dial: (&net.Dialer{
Timeout: 10 * time.Millisecond,
KeepAlive: 0,
}).Dial,

TLSHandshakeTimeout: 10 * time.Millisecond,
DisableKeepAlives: true,
},
},
&logger,
opts,
)
})

It("redacts every query param from endpoint for https calls", func() {
Expand Down
2 changes: 1 addition & 1 deletion logger/async_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ var _ = Describe("Logger", func() {
const (
MessageCount = 10
WriteInterval = 10 * time.Millisecond
Timeout = WriteInterval * MessageCount * 10
Timeout = WriteInterval * MessageCount * 100
)

out := &intervalWriter{dur: WriteInterval}
Expand Down
Loading