integrationtests: remove leftover code for Go 1.19

integrationtests/self/http_test.go

@@ -432,55 +432,53 @@ var _ = Describe("HTTP tests", func() {
  Eventually(done).Should(BeClosed())
  })
 
- if go120 {
- It("supports read deadlines", func() {
- mux.HandleFunc("/read-deadline", func(w http.ResponseWriter, r *http.Request) {
- defer GinkgoRecover()
- err := setReadDeadline(w, time.Now().Add(deadlineDelay))
- Expect(err).ToNot(HaveOccurred())
+ It("supports read deadlines", func() {
+ mux.HandleFunc("/read-deadline", func(w http.ResponseWriter, r *http.Request) {
+ defer GinkgoRecover()
+ rc := http.NewResponseController(w)
+ Expect(rc.SetReadDeadline(time.Now().Add(deadlineDelay))).To(Succeed())
 
-  body, err := io.ReadAll(r.Body)
-  Expect(err).To(MatchError(os.ErrDeadlineExceeded))
-  Expect(body).To(ContainSubstring("aa"))
+ body, err := io.ReadAll(r.Body)
+ Expect(err).To(MatchError(os.ErrDeadlineExceeded))
+ Expect(body).To(ContainSubstring("aa"))
 
-  w.Write([]byte("ok"))
-  })
+ w.Write([]byte("ok"))
+ })
 
-  expectedEnd := time.Now().Add(deadlineDelay)
-  resp, err := client.Post(
-  fmt.Sprintf("https://localhost:%d/read-deadline", port),
-  "text/plain",
-  neverEnding('a'),
-  )
-  Expect(err).ToNot(HaveOccurred())
-  Expect(resp.StatusCode).To(Equal(200))
+ expectedEnd := time.Now().Add(deadlineDelay)
+ resp, err := client.Post(
+ fmt.Sprintf("https://localhost:%d/read-deadline", port),
+ "text/plain",
+ neverEnding('a'),
+ )
+ Expect(err).ToNot(HaveOccurred())
+ Expect(resp.StatusCode).To(Equal(200))
 
-  body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 2*deadlineDelay))
-  Expect(err).ToNot(HaveOccurred())
-  Expect(time.Now().After(expectedEnd)).To(BeTrue())
-  Expect(string(body)).To(Equal("ok"))
-  })
+ body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 2*deadlineDelay))
+ Expect(err).ToNot(HaveOccurred())
+ Expect(time.Now().After(expectedEnd)).To(BeTrue())
+ Expect(string(body)).To(Equal("ok"))
+ })
 
-  It("supports write deadlines", func() {
-  mux.HandleFunc("/write-deadline", func(w http.ResponseWriter, r *http.Request) {
-  defer GinkgoRecover()
-  err := setWriteDeadline(w, time.Now().Add(deadlineDelay))
-  Expect(err).ToNot(HaveOccurred())
+ It("supports write deadlines", func() {
+ mux.HandleFunc("/write-deadline", func(w http.ResponseWriter, r *http.Request) {
+ defer GinkgoRecover()
+ rc := http.NewResponseController(w)
+ Expect(rc.SetWriteDeadline(time.Now().Add(deadlineDelay))).To(Succeed())
 
-  _, err = io.Copy(w, neverEnding('a'))
-  Expect(err).To(MatchError(os.ErrDeadlineExceeded))
-  })
+ _, err := io.Copy(w, neverEnding('a'))
+ Expect(err).To(MatchError(os.ErrDeadlineExceeded))
+ })
 
-  expectedEnd := time.Now().Add(deadlineDelay)
+ expectedEnd := time.Now().Add(deadlineDelay)
 
-  resp, err := client.Get(fmt.Sprintf("https://localhost:%d/write-deadline", port))
-  Expect(err).ToNot(HaveOccurred())
-  Expect(resp.StatusCode).To(Equal(200))
+ resp, err := client.Get(fmt.Sprintf("https://localhost:%d/write-deadline", port))
+ Expect(err).ToNot(HaveOccurred())
+ Expect(resp.StatusCode).To(Equal(200))
 
- body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 2*deadlineDelay))
- Expect(err).ToNot(HaveOccurred())
- Expect(time.Now().After(expectedEnd)).To(BeTrue())
- Expect(string(body)).To(ContainSubstring("aa"))
- })
- }
+ body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 2*deadlineDelay))
+ Expect(err).ToNot(HaveOccurred())
+ Expect(time.Now().After(expectedEnd)).To(BeTrue())
+ Expect(string(body)).To(ContainSubstring("aa"))
+ })
 })