From 2bdcc4ab910a2327749c28a837f3c78f72891299 Mon Sep 17 00:00:00 2001 From: Benjamin Wenger <ben@elixxir.ioo> Date: Sat, 8 Jan 2022 10:32:38 -0800 Subject: [PATCH] fixed some tests --- fileTransfer/manager_test.go | 2 +- storage/fileTransfer/receiveFileTransfers_test.go | 4 ++-- storage/fileTransfer/receiveTransfer_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fileTransfer/manager_test.go b/fileTransfer/manager_test.go index c5ebcac38..63952f154 100644 --- a/fileTransfer/manager_test.go +++ b/fileTransfer/manager_test.go @@ -394,7 +394,7 @@ func TestManager_CloseSend_NoFingerprints(t *testing.T) { transfer, _ := m.sent.GetTransfer(sti[0].tid) for fpNum := uint16(0); fpNum < sti[0].numFps; fpNum++ { partNum := fpNum % sti[0].numParts - _, _, _, err := transfer.GetEncryptedPart(partNum, partSize) + _, _, _, err := transfer.GetEncryptedPart(partNum, partSize+2) if err != nil { t.Errorf("Failed to encrypt part %d (%d): %+v", partNum, fpNum, err) } diff --git a/storage/fileTransfer/receiveFileTransfers_test.go b/storage/fileTransfer/receiveFileTransfers_test.go index 1bbbbd826..4fd245ec4 100644 --- a/storage/fileTransfer/receiveFileTransfers_test.go +++ b/storage/fileTransfer/receiveFileTransfers_test.go @@ -385,9 +385,9 @@ func TestReceivedFileTransfersStore_AddPart(t *testing.T) { // Check that the correct part was stored receivedPart := expectedRT.receivedParts.parts[partNum] - if !bytes.Equal(receivedPart, expectedData) { + if !bytes.Equal(receivedPart[:len(expectedData)], expectedData) { t.Errorf("Part in memory is not expected."+ - "\nexpected: %q\nreceived: %q", expectedData, receivedPart) + "\nexpected: %q\nreceived: %q", expectedData, receivedPart[:len(expectedData)]) } } diff --git a/storage/fileTransfer/receiveTransfer_test.go b/storage/fileTransfer/receiveTransfer_test.go index ff5c47ce5..281bb3738 100644 --- a/storage/fileTransfer/receiveTransfer_test.go +++ b/storage/fileTransfer/receiveTransfer_test.go @@ -569,9 +569,9 @@ func TestReceivedTransfer_AddPart(t *testing.T) { receivedData, exists := rt.receivedParts.parts[partNum] if !exists { t.Errorf("Part #%d not found in part map.", partNum) - } else if !bytes.Equal(expectedData, receivedData) { + } else if !bytes.Equal(expectedData, receivedData[:len(expectedData)]) { t.Fatalf("Part data in list does not match expected."+ - "\nexpected: %+v\nreceived: %+v", expectedData, receivedData) + "\nexpected: %+v\nreceived: %+v", expectedData, receivedData[:len(expectedData)]) } // Check that the fingerprint vector has correct values -- GitLab