From ca309096eb9900c642d7dadffb708afbf250cd05 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sun, 4 Dec 2022 23:28:24 -0800 Subject: [PATCH] doubled bob download timeout --- .drone.yml | 2 +- testing/cwtch_peer_server_integration_test.go | 3 ++- testing/filesharing/file_sharing_integration_test.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index fdc3e9f..4ee878e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,7 +47,7 @@ steps: path: /go commands: - export PATH=`pwd`:$PATH - - go test -race -v cwtch.im/cwtch/testing/filesharing + - go test -timeout=20m -race -v cwtch.im/cwtch/testing/filesharing - name: notify-gogs image: openpriv/drone-gogs pull: if-not-exists diff --git a/testing/cwtch_peer_server_integration_test.go b/testing/cwtch_peer_server_integration_test.go index a6a7c44..9845b81 100644 --- a/testing/cwtch_peer_server_integration_test.go +++ b/testing/cwtch_peer_server_integration_test.go @@ -11,6 +11,7 @@ import ( "cwtch.im/cwtch/protocol/connections" "encoding/base64" "encoding/json" + "fmt" "git.openprivacy.ca/cwtch.im/tapir/primitives/privacypass" "git.openprivacy.ca/openprivacy/connectivity/tor" "git.openprivacy.ca/openprivacy/log" @@ -409,7 +410,7 @@ func TestCwtchPeerIntegration(t *testing.T) { // Printing out the current goroutines // Very useful if we are leaking any. pprof.Lookup("goroutine").WriteTo(os.Stdout, 1) - + fmt.Println("") log.Infof("numGoRoutinesStart: %v\nnumGoRoutinesPostAppStart: %v\nnumGoRoutinesPostPeerStart: %v\nnumGoRoutinesPostPeerAndServerConnect: %v\n"+ "numGoRoutinesPostAlice: %v\nnumGoRoutinesPostCarolConnect: %v\nnumGoRoutinesPostBob: %v\nnumGoRoutinesPostCarol: %v\nnumGoRoutinesPostAppShutdown: %v", numGoRoutinesStart, numGoRoutinesPostAppStart, numGoRoutinesPostPeerStart, numGoRoutinesPostServerConnect, diff --git a/testing/filesharing/file_sharing_integration_test.go b/testing/filesharing/file_sharing_integration_test.go index e3006dd..b266847 100644 --- a/testing/filesharing/file_sharing_integration_test.go +++ b/testing/filesharing/file_sharing_integration_test.go @@ -215,7 +215,7 @@ func testBobDownloadFile(t *testing.T, bob peer.CwtchPeer, filesharingFunctional } // Wait for the file downloaded event - ClientTimeout := utils2.TimeoutPolicy(time.Second * 60) + ClientTimeout := utils2.TimeoutPolicy(time.Second * 120) err = ClientTimeout.ExecuteAction(func() error { ev := queueOracle.Next() if ev.EventType != event.FileDownloaded {