From 933e08f2f3579ef29ff54f0e4d50163a2a8a19e4 Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Wed, 29 Mar 2017 14:07:49 -0400 Subject: [PATCH] Replace deprecated tmpnam function. --- tests/unit_tests/blockchain_db.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/unit_tests/blockchain_db.cpp b/tests/unit_tests/blockchain_db.cpp index 5e798e31..5592106c 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();