go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-09-16 09:16:33 +02:00
Code Issues Releases Activity

pkg/http: Fix leaking goroutines in tests

Browse Source 
By using the context created by the test, the goroutines produced in
http.Client is actually closed when cancelled and such, not leaked.

Signed-off-by: Josef Johansson <josef86@gmail.com>
This commit is contained in:
Josef Johansson
2024-03-03 20:17:36 +01:00
parent bb6aba4a00
commit 8f7209ba1a
3 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/http/server_test.go
View File

@@ -587,7 +587,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(listenAddr)
resp, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -602,13 +602,13 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
cancel()
Eventually(func() error {
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
return err
}).Should(HaveOccurred())
})
@@ -641,7 +641,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(secureListenAddr)
resp, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -656,13 +656,13 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
_, err := client.Get(secureListenAddr)
_, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
cancel()
Eventually(func() error {
_, err := client.Get(secureListenAddr)
_, err := httpGet(ctx, secureListenAddr)
return err
}).Should(HaveOccurred())
})
@@ -673,7 +673,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(secureListenAddr)
resp, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -712,7 +712,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(listenAddr)
resp, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -727,7 +727,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(secureListenAddr)
resp, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -742,19 +742,19 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
_, err = client.Get(secureListenAddr)
_, err = httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
cancel()
Eventually(func() error {
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
return err
}).Should(HaveOccurred())
Eventually(func() error {
_, err := client.Get(secureListenAddr)
_, err := httpGet(ctx, secureListenAddr)
return err
}).Should(HaveOccurred())
})
@@ -784,7 +784,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(listenAddr)
resp, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -799,13 +799,13 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
cancel()
Eventually(func() error {
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
return err
}).Should(HaveOccurred())
})
@@ -839,7 +839,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(secureListenAddr)
resp, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -854,13 +854,13 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
_, err := client.Get(secureListenAddr)
_, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
cancel()
Eventually(func() error {
_, err := client.Get(secureListenAddr)
_, err := httpGet(ctx, secureListenAddr)
return err
}).Should(HaveOccurred())
})
@@ -871,7 +871,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(secureListenAddr)
resp, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -911,7 +911,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(listenAddr)
resp, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -926,7 +926,7 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
resp, err := client.Get(secureListenAddr)
resp, err := httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(http.StatusOK))
@@ -941,19 +941,19 @@ var _ = Describe("Server", func() {
Expect(srv.Start(ctx)).To(Succeed())
}()
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
Expect(err).ToNot(HaveOccurred())
_, err = client.Get(secureListenAddr)
_, err = httpGet(ctx, secureListenAddr)
Expect(err).ToNot(HaveOccurred())
cancel()
Eventually(func() error {
_, err := client.Get(listenAddr)
_, err := httpGet(ctx, listenAddr)
return err
}).Should(HaveOccurred())
Eventually(func() error {
_, err := client.Get(secureListenAddr)
_, err := httpGet(ctx, secureListenAddr)
return err
}).Should(HaveOccurred())
})