From dca06af62762db512d958352d7ceb8f082ebf20a Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Tue, 14 May 2024 09:11:19 +0200 Subject: [PATCH 1/3] fix(tlsmiddlebox): gofmt -s -w Part of https://github.com/ooni/probe/issues/2722 --- internal/experiment/tlsmiddlebox/syscall_unix.go | 2 +- internal/experiment/tlsmiddlebox/syscall_windows.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/experiment/tlsmiddlebox/syscall_unix.go b/internal/experiment/tlsmiddlebox/syscall_unix.go index 1562f53807..5a54bcd4d0 100644 --- a/internal/experiment/tlsmiddlebox/syscall_unix.go +++ b/internal/experiment/tlsmiddlebox/syscall_unix.go @@ -8,8 +8,8 @@ package tlsmiddlebox import ( "net" - "syscall" "strings" + "syscall" ) // SetTTL sets the IP TTL field for the underlying net.TCPConn diff --git a/internal/experiment/tlsmiddlebox/syscall_windows.go b/internal/experiment/tlsmiddlebox/syscall_windows.go index ba00cdc811..d9597e5c54 100644 --- a/internal/experiment/tlsmiddlebox/syscall_windows.go +++ b/internal/experiment/tlsmiddlebox/syscall_windows.go @@ -8,8 +8,8 @@ package tlsmiddlebox import ( "net" - "syscall" "strings" + "syscall" ) // SetTTL sets the IP TTL field for the underlying net.TCPConn From b1eaaca71bdb8d647caab4c5493b4c31da862639 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Tue, 14 May 2024 09:16:26 +0200 Subject: [PATCH 2/3] fix(docs/releasing.md): correct typo --- docs/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releasing.md b/docs/releasing.md index 61ecffc252..99d7962369 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -65,7 +65,7 @@ version that is compatible with our dependencies. We should additionally update the `toolchain` line inside of `go.mod` to use the specific toolchain we want to use. (The `toolchain` mechanism was introduced by Go 1.21.0 and it may be that we can now use just the `toolchain` instead of -using the `GOVERSIOn` file; this should eventually be investigated.) +using the `GOVERSION` file; this should eventually be investigated.) After updating `GOVERSION` and `go.mod`, we need to update our stdlib forks: From c84186c6fd3ca50c8347a1e548b63362284086f1 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Tue, 14 May 2024 09:20:02 +0200 Subject: [PATCH 3/3] x --- internal/webconnectivityalgo/calltesthelpers_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/webconnectivityalgo/calltesthelpers_test.go b/internal/webconnectivityalgo/calltesthelpers_test.go index 0fa53b6cd3..934ac5db58 100644 --- a/internal/webconnectivityalgo/calltesthelpers_test.go +++ b/internal/webconnectivityalgo/calltesthelpers_test.go @@ -235,9 +235,6 @@ func TestSessionCallWebConnectivityTestHelper(t *testing.T) { }) t.Run("with two test helpers where the first one times out the connection and the second works", func(t *testing.T) { - // TODO(bassosimone): the utility of this test will become more obvious - // once we switch this specific test to using httpclientx. - // create a local test server1 that resets the connection after a ~long delay server1 := testingx.MustNewHTTPServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { select {