mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-02 21:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'test: changes to prepare for dropping FMT_DEPRECATED_OSTREAM' from Kefu Chai

Browse Source 
this series includes test related changes to enable us to drop `FMT_DEPRECATED_OSTREAM` deprecated in {fmt} v10.

Refs #13245

Closes scylladb/scylladb#18054

* github.com:scylladb/scylladb:
  test: unit: add fmt::formatter for test_data in tests
  test/lib: do not print with fmt::to_string()
  test/boost: print runtime_error using e.what()
This commit is contained in:
Botond Dénes
2024-03-28 15:33:56 +02:00
parent 33751f8f4e 71a519dee8
commit 4c0dadee7c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/boost/database_test.cc
View File

@@ -972,9 +972,9 @@ SEASTAR_THREAD_TEST_CASE(read_max_size) {
}
} catch (std::runtime_error& e) {
if (should_throw) {
testlog.trace("Exception thrown, as expected: {}", e);
testlog.trace("Exception thrown, as expected: {}", e.what());
} else {
BOOST_FAIL(fmt::format("Expected no exception, but caught: {}", e));
BOOST_FAIL(fmt::format("Expected no exception, but caught: {}", e.what()));
}
}
}
@@ -1044,7 +1044,7 @@ SEASTAR_THREAD_TEST_CASE(unpaged_mutation_read_global_limit) {
BOOST_REQUIRE(size != 0);
BOOST_FAIL("Expected exception, but none was thrown.");
} catch (std::runtime_error& e) {
testlog.trace("Exception thrown, as expected: {}", e);
testlog.trace("Exception thrown, as expected: {}", e.what());
}
}
}, std::move(cfg)).get();

2
test/lib/cql_assertions.cc
View File

@@ -38,7 +38,7 @@ rows_assertions::is_empty() {
auto row_count = rs.size();
if (row_count != 0) {
auto&& first_row = *rs.rows().begin();
fail(format("Expected no rows, but got {:d}. First row: {}", row_count, fmt::to_string(first_row)));
fail(format("Expected no rows, but got {:d}. First row: {}", row_count, first_row));
}
return {*this};
}

9
test/unit/radix_tree_stress_test.cc
View File

@@ -41,10 +41,11 @@ public:
}
};
std::ostream& operator<<(std::ostream& out, const test_data& d) {
out << d.value();
return out;
}
template <> struct fmt::formatter<test_data> : fmt::formatter<std::string_view> {
auto format(const test_data& d, fmt::format_context& ctx) const {
return fmt::format_to(ctx.out(), "{}", d.value());
}
};
using test_tree = tree<test_data>;