From b0a83e7f188a5174f70f715f8fd0d56044bd35fe Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Wed, 12 Jun 2024 11:11:57 -0400
Subject: [PATCH] tests/fileTransfer: testTooLarge
GitLab: #972
Change-Id: Ic345e31ff51c9d51b50df0c911594e9d7f07ebbb
---
test/unitTest/conversation/conversationRequest.cpp | 8 ++++----
test/unitTest/fileTransfer/fileTransfer.cpp | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/test/unitTest/conversation/conversationRequest.cpp b/test/unitTest/conversation/conversationRequest.cpp
index e329ab8823..ad9e574eb8 100644
--- a/test/unitTest/conversation/conversationRequest.cpp
+++ b/test/unitTest/conversation/conversationRequest.cpp
@@ -333,8 +333,8 @@ ConversationRequestTest::connectSignals()
void
ConversationRequestTest::tearDown()
{
- auto bobArchive = std::filesystem::current_path().string() + "/bob.gz";
- std::remove(bobArchive.c_str());
+ auto bobArchive = std::filesystem::current_path() / "bob.gz";
+ std::filesystem::remove(bobArchive);
if (bob2Id.empty()) {
wait_for_removal_of({aliceId, bobId, carlaId});
@@ -604,8 +604,8 @@ ConversationRequestTest::testRemoveContactMultiDevice()
// Add second device for Bob
std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>> confHandlers;
- auto bobArchive = std::filesystem::current_path().string() + "/bob.gz";
- std::remove(bobArchive.c_str());
+ auto bobArchive = std::filesystem::current_path() / "bob.gz";
+ std::filesystem::remove(bobArchive);
bobAccount->exportArchive(bobArchive);
std::map<std::string, std::string> details = libjami::getAccountTemplate("RING");
diff --git a/test/unitTest/fileTransfer/fileTransfer.cpp b/test/unitTest/fileTransfer/fileTransfer.cpp
index 1c12756685..072fa1e307 100644
--- a/test/unitTest/fileTransfer/fileTransfer.cpp
+++ b/test/unitTest/fileTransfer/fileTransfer.cpp
@@ -192,6 +192,7 @@ FileTransferTest::connectSignals()
[&](const std::string& accountId,
const std::string& /* conversationId */,
libjami::SwarmMessage message) {
+ std::unique_lock<std::mutex> lk {mtx};
if (accountId == aliceId) {
aliceData.messages.emplace_back(message);
} else if (accountId == bobId) {
@@ -389,7 +390,7 @@ FileTransferTest::testBadSha3sumOut()
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobMsgSize + 1 == bobData.messages.size(); }));
// modifiy file
- sendFile = std::ofstream(sendPath);
+ sendFile = std::ofstream(sendPath, std::ios::trunc);
CPPUNIT_ASSERT(sendFile.is_open());
sendFile << std::string(64000, 'B');
sendFile.close();
@@ -635,7 +636,7 @@ FileTransferTest::testTooLarge()
auto fileId = bobData.messages.rbegin()->body["fileId"];
// Add some data for the reception. This will break the final shasum
- std::ofstream recvFile(recvPath);
+ std::ofstream recvFile(recvPath + std::string(".tmp"));
CPPUNIT_ASSERT(recvFile.is_open());
recvFile << std::string(1000, 'B');
recvFile.close();
--
GitLab