From 671e7b998cd6fd3dc40d03520004b0c8d7a1a136 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Tue, 21 Dec 2021 22:00:43 +0000
Subject: [PATCH] Fix timeout
---
fileTransfer/send_test.go | 41 ++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/fileTransfer/send_test.go b/fileTransfer/send_test.go
index f67a5280e..49556db3b 100644
--- a/fileTransfer/send_test.go
+++ b/fileTransfer/send_test.go
@@ -682,16 +682,35 @@ func TestManager_newCmixMessage(t *testing.T) {
// Tests that Manager.makeRoundEventCallback returns a callback that calls the
// progress callback when a round succeeds.
func TestManager_makeRoundEventCallback(t *testing.T) {
- sendE2eChan := make(chan message.Receive, 10)
+ sendE2eChan := make(chan message.Receive, 100)
m := newTestManager(false, nil, sendE2eChan, nil, nil, t)
- callbackChan := make(chan sentProgressResults, 10)
+ callbackChan := make(chan sentProgressResults, 100)
progressCB := func(completed bool, sent, arrived, total uint16,
tr interfaces.FilePartTracker, err error) {
callbackChan <- sentProgressResults{
completed, sent, arrived, total, tr, err}
}
+ // Add recipient as partner
+ recipient := id.NewIdFromString("recipient", id.User, t)
+ grp := m.store.E2e().GetGroup()
+ dhKey := grp.NewInt(42)
+ pubKey := diffieHellman.GeneratePublicKey(dhKey, grp)
+ p := params.GetDefaultE2ESessionParams()
+
+ rng := csprng.NewSystemRNG()
+ _, mySidhPriv := util.GenerateSIDHKeyPair(sidh.KeyVariantSidhA,
+ rng)
+ theirSidhPub, _ := util.GenerateSIDHKeyPair(
+ sidh.KeyVariantSidhB, rng)
+
+ err := m.store.E2e().AddPartner(recipient, pubKey, dhKey, mySidhPriv,
+ theirSidhPub, p, p)
+ if err != nil {
+ t.Errorf("Failed to add partner %s: %+v", recipient, err)
+ }
+
done0, done1 := make(chan bool), make(chan bool)
go func() {
for i := 0; i < 2; i++ {
@@ -715,24 +734,6 @@ func TestManager_makeRoundEventCallback(t *testing.T) {
}
}()
- // Add recipient as partner
- recipient := id.NewIdFromString("recipient", id.User, t)
- grp := m.store.E2e().GetGroup()
- dhKey := grp.NewInt(42)
- pubKey := diffieHellman.GeneratePublicKey(dhKey, grp)
- p := params.GetDefaultE2ESessionParams()
-
- rng := csprng.NewSystemRNG()
- _, mySidhPriv := util.GenerateSIDHKeyPair(sidh.KeyVariantSidhA,
- rng)
- theirSidhPub, _ := util.GenerateSIDHKeyPair(
- sidh.KeyVariantSidhB, rng)
-
- err := m.store.E2e().AddPartner(recipient, pubKey, dhKey, mySidhPriv,
- theirSidhPub, p, p)
- if err != nil {
- t.Errorf("Failed to add partner %s: %+v", recipient, err)
- }
prng := NewPrng(42)
key, _ := ftCrypto.NewTransferKey(prng)
--
GitLab