Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1944

Browse Source 
933e08f2 Replace deprecated tmpnam function. (Randi Joseph)
This commit is contained in:
Riccardo Spagni 2017-04-11 00:20:57 +02:00
commit 6e9b659c07
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/unit_tests/blockchain_db.cpp
View File

@ -242,27 +242,31 @@ TYPED_TEST_CASE(BlockchainDBTest, implementations);
TYPED_TEST(BlockchainDBTest, OpenAndClose) TYPED_TEST(BlockchainDBTest, OpenAndClose)
{ {
std::string fname(tmpnam(NULL)); boost::filesystem::path tempPath = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
std::string dirPath = tempPath.string();
this->set_prefix(fname); this->set_prefix(dirPath);
// make sure open does not throw // make sure open does not throw
ASSERT_NO_THROW(this->m_db->open(fname)); ASSERT_NO_THROW(this->m_db->open(dirPath));
this->get_filenames(); this->get_filenames();
// make sure open when already open DOES throw // make sure open when already open DOES throw
ASSERT_THROW(this->m_db->open(fname), DB_OPEN_FAILURE); ASSERT_THROW(this->m_db->open(dirPath), DB_OPEN_FAILURE);
ASSERT_NO_THROW(this->m_db->close()); ASSERT_NO_THROW(this->m_db->close());
} }
TYPED_TEST(BlockchainDBTest, AddBlock) TYPED_TEST(BlockchainDBTest, AddBlock)
{ {
std::string fname(tmpnam(NULL));
this->set_prefix(fname); boost::filesystem::path tempPath = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
std::string dirPath = tempPath.string();
this->set_prefix(dirPath);
// make sure open does not throw // make sure open does not throw
ASSERT_NO_THROW(this->m_db->open(fname)); ASSERT_NO_THROW(this->m_db->open(dirPath));
this->get_filenames(); this->get_filenames();
this->init_hard_fork(); this->init_hard_fork();
@ -302,11 +306,13 @@ TYPED_TEST(BlockchainDBTest, AddBlock)
TYPED_TEST(BlockchainDBTest, RetrieveBlockData) TYPED_TEST(BlockchainDBTest, RetrieveBlockData)
{ {
std::string fname(tmpnam(NULL)); boost::filesystem::path tempPath = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
this->set_prefix(fname); std::string dirPath = tempPath.string();
this->set_prefix(dirPath);
// make sure open does not throw // make sure open does not throw
ASSERT_NO_THROW(this->m_db->open(fname)); ASSERT_NO_THROW(this->m_db->open(dirPath));
this->get_filenames(); this->get_filenames();
this->init_hard_fork(); this->init_hard_fork();