aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandi Joseph <randi@codehalo.com>2017-03-29 14:07:49 -0400
committerRandi Joseph <randi@codehalo.com>2017-03-29 22:32:00 -0400
commit933e08f2f3579ef29ff54f0e4d50163a2a8a19e4 (patch)
tree0beb056a43da1c755bde1cfce968a018c66b01c9
parentMerge pull request #1930 (diff)
downloadmonero-933e08f2f3579ef29ff54f0e4d50163a2a8a19e4.tar.xz
Replace deprecated tmpnam function.
-rw-r--r--tests/unit_tests/blockchain_db.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/tests/unit_tests/blockchain_db.cpp b/tests/unit_tests/blockchain_db.cpp
index 5e798e31c..5592106cb 100644
--- a/tests/unit_tests/blockchain_db.cpp
+++ b/tests/unit_tests/blockchain_db.cpp
@@ -242,27 +242,31 @@ TYPED_TEST_CASE(BlockchainDBTest, implementations);
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
- ASSERT_NO_THROW(this->m_db->open(fname));
+ ASSERT_NO_THROW(this->m_db->open(dirPath));
this->get_filenames();
// 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());
}
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
- ASSERT_NO_THROW(this->m_db->open(fname));
+ ASSERT_NO_THROW(this->m_db->open(dirPath));
this->get_filenames();
this->init_hard_fork();
@@ -302,11 +306,13 @@ TYPED_TEST(BlockchainDBTest, AddBlock)
TYPED_TEST(BlockchainDBTest, RetrieveBlockData)
{
- 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
- ASSERT_NO_THROW(this->m_db->open(fname));
+ ASSERT_NO_THROW(this->m_db->open(dirPath));
this->get_filenames();
this->init_hard_fork();