gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-28 14:47:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix Windows unit test failures

Browse Source 
Preserve line endings for test fixtures so file hashes remain stable
across platforms.

Temporarily release the wallet keys lock while inspecting the keys file,
then reacquire it and verify the lock state. This lets the test read the
file on Windows, where the lock prevents a concurrent read open.

Avoid passing possibly negative char values to std::isprint(), which is
undefined behavior except for EOF.
This commit is contained in:
selsta
2026-06-30 18:39:11 +02:00
parent ad6b10f33c
commit eaf139a25a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1
View File
@@ -1,2 +1,3 @@
.git* export-ignore
version.cmake export-subst
tests/data/** -text
tests/unit_tests/wallet_storage.cpp
+8 -4
View File
@@ -302,7 +302,7 @@ TEST(wallet_storage, gen_ascii_format)
ASSERT_TRUE(epee::file_io_utils::load_file_to_string(target_wallet_file.string() + ".keys", key_file_contents));
EXPECT_NE(std::string::npos, key_file_contents.find(WALLET2_ASCII_OUTPUT_MAGIC));
for (const char c : key_file_contents)
ASSERT_TRUE(std::isprint(c) || c == '\n' || c == '\r');
ASSERT_TRUE(std::isprint(static_cast<unsigned char>(c)) || c == '\n' || c == '\r');
}
{
@@ -340,12 +340,16 @@ TEST(wallet_storage, change_export_format)
// Assert that we initially store keys in binary format
{
std::string key_file_contents;
ASSERT_TRUE(epee::file_io_utils::load_file_to_string(target_wallet_file.string() + ".keys", key_file_contents));
ASSERT_TRUE(w.unlock_keys_file());
const bool loaded = epee::file_io_utils::load_file_to_string(target_wallet_file.string() + ".keys", key_file_contents);
ASSERT_TRUE(w.lock_keys_file());
ASSERT_TRUE(w.is_keys_file_locked());
ASSERT_TRUE(loaded);
EXPECT_EQ(std::string::npos, key_file_contents.find(WALLET2_ASCII_OUTPUT_MAGIC));
bool only_printable = true;
for (const char c : key_file_contents)
{
if (!std::isprint(c) && c != '\n' && c != '\r')
if (!std::isprint(static_cast<unsigned char>(c)) && c != '\n' && c != '\r')
{
only_printable = false;
break;
@@ -369,7 +373,7 @@ TEST(wallet_storage, change_export_format)
ASSERT_TRUE(epee::file_io_utils::load_file_to_string(target_wallet_file.string() + ".keys", key_file_contents));
EXPECT_NE(std::string::npos, key_file_contents.find(WALLET2_ASCII_OUTPUT_MAGIC));
for (const char c : key_file_contents)
ASSERT_TRUE(std::isprint(c) || c == '\n' || c == '\r');
ASSERT_TRUE(std::isprint(static_cast<unsigned char>(c)) || c == '\n' || c == '\r');
}
{