doubled bob download timeout

.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

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,

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 {