Merge pull request #67 from EOSIO/v2.0.x-test-fix

Fix test error: set allow_dirty to true for db2 to make test pass
EOSIO · May 15, 2020 · 04c1afd · 04c1afd
2 parents d6632fc + 1c54ab6
commit 04c1afd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,6 +71,7 @@ if(WIN32)
    target_link_libraries( chainbase ws2_32 mswsock )
 endif()
 
+enable_testing()
 add_subdirectory( test )
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/chainbase DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -2,3 +2,4 @@ file(GLOB UNIT_TESTS "*.cpp")
 add_executable( chainbase_test ${UNIT_TESTS}  )
 target_link_libraries( chainbase_test  chainbase Boost::unit_test_framework ${OPENSSL_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} )
 
+add_test(NAME test_chainbase COMMAND chainbase_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
diff --git a/test/test.cpp b/test/test.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE( open_and_create ) {
       std::cerr << temp << " \n";
 
       chainbase::database db(temp, database::read_write, 1024*1024*8);
-      chainbase::database db2(temp); /// open an already created db
+      chainbase::database db2(temp, database::read_only, 0, true); /// open an already created db
       BOOST_CHECK_THROW( db2.add_index< book_index >(), std::runtime_error ); /// index does not exist in read only database
 
       db.add_index< book_index >();
@@ -129,6 +129,7 @@ BOOST_AUTO_TEST_CASE( open_and_create ) {
       bfs::remove_all( temp );
       throw;
    }
+   bfs::remove_all( temp );
 }
 
 // BOOST_AUTO_TEST_SUITE_END()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ file(GLOB UNIT_TESTS "*.cpp")
		add_executable( chainbase_test ${UNIT_TESTS} )
		target_link_libraries( chainbase_test chainbase Boost::unit_test_framework ${OPENSSL_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} )

		add_test(NAME test_chainbase COMMAND chainbase_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})