TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-09 04:19:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use test_logger in more tests

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-08-13 20:39:20 +02:00
parent cbbb16e7dc
commit b4df3eb522
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/dwarfs.cpp
View File

@ -50,6 +50,7 @@
#include "loremipsum.h" #include "loremipsum.h"
#include "mmap_mock.h" #include "mmap_mock.h"
#include "test_helpers.h" #include "test_helpers.h"
#include "test_logger.h"
using namespace dwarfs; using namespace dwarfs;
@ -135,8 +136,7 @@ void basic_end_to_end_test(std::string const& compressor,
} }
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
auto input = test::os_access_mock::create_test_instance(); auto input = test::os_access_mock::create_test_instance();
@ -558,8 +558,7 @@ TEST_P(packing_test, regression_empty_fs) {
options.force_pack_string_tables = true; options.force_pack_string_tables = true;
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
auto input = std::make_shared<test::os_access_mock>(); auto input = std::make_shared<test::os_access_mock>();
@ -633,8 +632,7 @@ TEST(block_manager, regression_block_boundary) {
opts.metadata.check_consistency = true; opts.metadata.check_consistency = true;
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
std::vector<size_t> fs_blocks; std::vector<size_t> fs_blocks;
@ -682,8 +680,7 @@ TEST_P(compression_regression, github45) {
opts.metadata.check_consistency = true; opts.metadata.check_consistency = true;
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
std::independent_bits_engine<std::mt19937_64, std::independent_bits_engine<std::mt19937_64,
std::numeric_limits<uint8_t>::digits, uint16_t> std::numeric_limits<uint8_t>::digits, uint16_t>
@ -763,8 +760,7 @@ TEST_P(file_scanner, inode_ordering) {
auto [order_mode, file_hash_algo] = GetParam(); auto [order_mode, file_hash_algo] = GetParam();
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
auto bmcfg = block_manager::config(); auto bmcfg = block_manager::config();
auto opts = scanner_options(); auto opts = scanner_options();
@ -814,8 +810,7 @@ TEST_P(filter, filesystem) {
options.remove_empty_dirs = true; options.remove_empty_dirs = true;
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
auto scr = std::make_shared<builtin_script>(lgr); auto scr = std::make_shared<builtin_script>(lgr);
@ -867,8 +862,7 @@ INSTANTIATE_TEST_SUITE_P(dwarfs, filter,
TEST(file_scanner, input_list) { TEST(file_scanner, input_list) {
std::ostringstream logss; std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock test::test_logger lgr;
lgr.set_policy<prod_logger_policy>();
auto bmcfg = block_manager::config(); auto bmcfg = block_manager::config();
auto opts = scanner_options(); auto opts = scanner_options();

8
test/dwarfs_badfs.cpp
View File

@ -29,6 +29,8 @@
#include "dwarfs/mmap.h" #include "dwarfs/mmap.h"
#include "dwarfs/options.h" #include "dwarfs/options.h"
#include "test_logger.h"
using namespace dwarfs; using namespace dwarfs;
namespace { namespace {
@ -52,14 +54,14 @@ class bad_fs : public ::testing::TestWithParam<std::string> {};
TEST_P(bad_fs, test) { TEST_P(bad_fs, test) {
auto filename = testdata / GetParam(); auto filename = testdata / GetParam();
std::ostringstream oss, oss2; test::test_logger lgr;
stream_logger lgr(oss); std::ostringstream oss;
int nerror = 0; int nerror = 0;
try { try {
nerror = nerror =
filesystem_v2::identify(lgr, std::make_shared<mmap>(filename), oss2, 9, filesystem_v2::identify(lgr, std::make_shared<mmap>(filename), oss, 9,
1, true, filesystem_options::IMAGE_OFFSET_AUTO); 1, true, filesystem_options::IMAGE_OFFSET_AUTO);
} catch (std::exception const&) { } catch (std::exception const&) {
nerror = 1; nerror = 1;

10
test/dwarfs_compat.cpp
View File

@ -48,6 +48,7 @@
#include "dwarfs/worker_group.h" #include "dwarfs/worker_group.h"
#include "mmap_mock.h" #include "mmap_mock.h"
#include "test_logger.h"
using namespace dwarfs; using namespace dwarfs;
@ -1037,8 +1038,7 @@ void check_dynamic(std::string const& version, filesystem_v2 const& fs) {
} }
TEST_P(compat_metadata, backwards_compat) { TEST_P(compat_metadata, backwards_compat) {
std::ostringstream oss; test::test_logger lgr;
stream_logger lgr(oss);
auto version = GetParam(); auto version = GetParam();
auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs"; auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
filesystem_v2 fs(lgr, std::make_shared<mmap>(filename)); filesystem_v2 fs(lgr, std::make_shared<mmap>(filename));
@ -1054,8 +1054,7 @@ class compat_filesystem
TEST_P(compat_filesystem, backwards_compat) { TEST_P(compat_filesystem, backwards_compat) {
auto [version, enable_nlink] = GetParam(); auto [version, enable_nlink] = GetParam();
std::ostringstream oss; test::test_logger lgr;
stream_logger lgr(oss);
auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs"; auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
filesystem_options opts; filesystem_options opts;
@ -1097,8 +1096,7 @@ class rewrite
TEST_P(rewrite, filesystem_rewrite) { TEST_P(rewrite, filesystem_rewrite) {
auto [version, recompress_block, recompress_metadata] = GetParam(); auto [version, recompress_block, recompress_metadata] = GetParam();
std::ostringstream oss; test::test_logger lgr;
stream_logger lgr(oss);
auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs"; auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
rewrite_options opts; rewrite_options opts;