Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix tests

Browse source
This commit is contained in:
Piotr Wójcik 2025-07-08 17:48:18 +02:00
commit c8762e77df
3 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
nano/core_test/block_store.cpp
View file

@ -612,8 +612,7 @@ TEST (block_store, latest_find)
ASSERT_EQ (second, find3);
}
namespace nano::store::lmdb
{
// TODO: Move to lmdb specific test file
TEST (mdb_block_store, supported_version_upgrades)
{
if (nano::rocksdb_config::using_rocksdb_in_tests ())
@ -636,7 +635,7 @@ TEST (mdb_block_store, supported_version_upgrades)
// Upgrade should fail
{
nano::store::lmdb::component store (logger, path, nano::dev::constants);
ASSERT_THROW (nano::store::lmdb::component store (logger, path, nano::dev::constants), std::runtime_error);
}
auto path1 (nano::unique_path () / "data.ldb");
@ -652,11 +651,11 @@ TEST (mdb_block_store, supported_version_upgrades)
// Upgrade should work
{
nano::store::lmdb::component store (logger, path1, nano::dev::constants);
ASSERT_NO_THROW (nano::store::lmdb::component store (logger, path1, nano::dev::constants));
}
}
}
// TODO: Move to lmdb specific test file
TEST (mdb_block_store, bad_path)
{
if (nano::rocksdb_config::using_rocksdb_in_tests ())
@ -665,21 +664,13 @@ TEST (mdb_block_store, bad_path)
GTEST_SKIP ();
}
nano::logger logger;
try
auto path = nano::unique_path ();
path /= "data.ldb";
{
auto path = nano::unique_path ();
path /= "data.ldb";
{
std::ofstream stream (path.c_str ());
}
std::filesystem::permissions (path, std::filesystem::perms::none);
nano::store::lmdb::component store (logger, path, nano::dev::constants);
std::ofstream stream (path.c_str ());
}
catch (std::runtime_error &)
{
return;
}
ASSERT_TRUE (false);
std::filesystem::permissions (path, std::filesystem::perms::none);
ASSERT_THROW (nano::store::lmdb::component store (logger, path, nano::dev::constants), std::runtime_error);
}
TEST (block_store, DISABLED_already_open) // File can be shared
@ -1614,9 +1605,7 @@ TEST (block_store, incompatible_version)
}
// Now try and read it, should give an error
{
auto store = nano::make_store (logger, path, nano::dev::constants, true);
}
ASSERT_THROW (nano::make_store (logger, path, nano::dev::constants, true), std::runtime_error);
}
TEST (block_store, reset_renew_existing_transaction)

1
nano/store/component.hpp
View file

@ -34,7 +34,6 @@ namespace store
class component
{
friend class rocksdb_block_store_tombstone_count_Test;
friend class mdb_block_store_upgrade_v21_v22_Test;
public:
explicit component (

4
nano/store/lmdb/lmdb.hpp
View file

@ -136,10 +136,6 @@ private:
uint64_t after_v0{ 0 };
uint64_t after_v1{ 0 };
};
friend class mdb_block_store_supported_version_upgrades_Test;
friend class mdb_block_store_upgrade_v21_v22_Test;
friend class block_store_DISABLED_change_dupsort_Test;
};
bool success (int status);