Back out all debug logging

matrix-org · Dec 1, 2023 · bcbdebe · bcbdebe
1 parent 90c7417
commit bcbdebe
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -102,7 +102,7 @@ jobs:
           export LD_LIBRARY_PATH="$(pwd)/rust-sdk/target/debug"
           env
           set -o pipefail &&
-          go test -v -json -timeout 5m -run '^TestClientRetriesSendToDevice$' ./tests | gotestfmt
+          go test -v -json -timeout 15m ./tests | gotestfmt
         shell: bash # required for pipefail to be A Thing. pipefail is required to stop gotestfmt swallowing non-zero exit codes
         name: Run Complement Crypto Tests
         env:

diff --git a/internal/deploy/deploy.go b/internal/deploy/deploy.go
@@ -250,7 +250,6 @@ func RunNewDeployment(t *testing.T, shouldTCPDump bool) *SlidingSyncDeployment {
 	controllerURL = strings.Replace(controllerURL, "localhost", "127.0.0.1", 1)
 	proxyURL, err := url.Parse(controllerURL)
 	must.NotError(t, "failed to parse controller URL", err)
-	t.Logf("mitm proxy url => %s", proxyURL.String())
 	return &SlidingSyncDeployment{
 		Deployment:     deployment,
 		slidingSync:    ssContainer,

diff --git a/tests/addons/__init__.py b/tests/addons/__init__.py
@@ -8,4 +8,4 @@
     StatusCode(),
 ]
 # testcontainers will look for this log line
-print("loading complement crypto addons", flush=True)
+print("loading complement crypto addons", flush=True)
diff --git a/tests/client_connectivity_test.go b/tests/client_connectivity_test.go
@@ -1,9 +1,7 @@
 package tests
 
 import (
-	"fmt"
 	"net/http"
-	"os/exec"
 	"testing"
 	"time"
 
@@ -14,11 +12,6 @@ import (
 func TestClientRetriesSendToDevice(t *testing.T) {
 	ClientTypeMatrix(t, func(t *testing.T, clientTypeA, clientTypeB api.ClientType) {
 		tc := CreateTestContext(t, clientTypeA, clientTypeB)
-		t.Logf("checking mitm")
-		cmd := exec.Command("curl", "-v", "-X", "POST", "-d", "{}", "-x", tc.Deployment.ControllerURL, "http://mitm.code/options/unlock")
-		output, cerr := cmd.CombinedOutput()
-		fmt.Println(cerr)
-		fmt.Println(string(output))
 		roomID := tc.CreateNewEncryptedRoom(t, tc.Alice, "public_chat", nil)
 		tc.Bob.MustJoinRoom(t, roomID, []string{clientTypeA.HS})
 		alice := tc.MustLoginClient(t, tc.Alice, clientTypeA)