diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx index 402f57e83a8202..9889a432f408ff 100644 --- a/core/testsupport/src/TestSupport.cxx +++ b/core/testsupport/src/TestSupport.cxx @@ -57,16 +57,6 @@ static struct ForbidDiagnostics { } // FIXME: RNTuple warns that it's in beta stage. - if (level == kWarning - && strstr(msg, "The RNTuple file format will change. Do not store real data with this version of RNTuple!") != nullptr) { - std::cerr << "Warning in " << location << " " << msg << std::endl; - return; - } - if (level == kWarning - && strstr(msg, "Pre-release format version: RC ") != nullptr) { - std::cerr << "Warning in " << location << " " << msg << std::endl; - return; - } if (level == kWarning && strstr(msg, "Merging RNTuples is experimental") != nullptr) { std::cerr << "Warning in " << location << " " << msg << std::endl; return; diff --git a/tree/ntuple/v7/src/RPageStorageFile.cxx b/tree/ntuple/v7/src/RPageStorageFile.cxx index a7d8ddb984147c..6177432c41078d 100644 --- a/tree/ntuple/v7/src/RPageStorageFile.cxx +++ b/tree/ntuple/v7/src/RPageStorageFile.cxx @@ -47,11 +47,6 @@ ROOT::Experimental::Internal::RPageSinkFile::RPageSinkFile(std::string_view ntup const RNTupleWriteOptions &options) : RPagePersistentSink(ntupleName, options) { - static std::once_flag once; - std::call_once(once, []() { - R__LOG_WARNING(NTupleLog()) << "The RNTuple file format will change. " - << "Do not store real data with this version of RNTuple!"; - }); fCompressor = std::make_unique(); EnableDefaultMetrics("RPageSinkFile"); fFeatures.fCanMergePages = true; diff --git a/tree/ntuple/v7/test/ntuple_merger.cxx b/tree/ntuple/v7/test/ntuple_merger.cxx index 50f03eac74aa71..119fa318b3293e 100644 --- a/tree/ntuple/v7/test/ntuple_merger.cxx +++ b/tree/ntuple/v7/test/ntuple_merger.cxx @@ -734,8 +734,6 @@ TEST(RNTupleMerger, MergeThroughTFileMergerIncremental) TEST(RNTupleMerger, MergeThroughTFileMergerKey) { ROOT::TestSupport::CheckDiagsRAII diags; - diags.optionalDiag(kWarning, "RPageSinkFile", "The RNTuple file format will change.", false); - diags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 2", false); diags.requiredDiag(kWarning, "TFileMerger", "Merging RNTuples is experimental"); diags.requiredDiag(kError, "RNTuple::Merge", "Output file already has key, but not of type RNTuple!"); diags.requiredDiag(kError, "TFileMerger", "Could NOT merge RNTuples!"); @@ -774,8 +772,6 @@ TEST(RNTupleMerger, MergeThroughTFileMergerKey) TEST(RNTupleMerger, MergeThroughTBufferMerger) { ROOT::TestSupport::CheckDiagsRAII diags; - diags.optionalDiag(kWarning, "RPageSinkFile", "The RNTuple file format will change.", false); - diags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 2", false); diags.requiredDiag(kWarning, "TFileMerger", "Merging RNTuples is experimental"); diags.requiredDiag(kWarning, "TBufferMergerFile", "not attached to the directory", false); diff --git a/tree/ntuple/v7/test/ntuple_storage_daos.cxx b/tree/ntuple/v7/test/ntuple_storage_daos.cxx index 40201fdd8842c3..4a49da6699fffb 100644 --- a/tree/ntuple/v7/test/ntuple_storage_daos.cxx +++ b/tree/ntuple/v7/test/ntuple_storage_daos.cxx @@ -26,7 +26,6 @@ class RPageStorageDaos : public ::testing::Test { // Initialized at the start of each test to expect diagnostic messages from TestSupport fRootDiags.optionalDiag(kWarning, "ROOT::Experimental::Internal::RPageSinkDaos::RPageSinkDaos", "The DAOS backend is experimental and still under development.", false); - fRootDiags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 3", false); fRootDiags.optionalDiag(kWarning, "in int daos_init()", "This RNTuple build uses libdaos_mock. Use only for testing!"); } diff --git a/tree/ntuple/v7/test/rfield_class.cxx b/tree/ntuple/v7/test/rfield_class.cxx index 939b4f1a90d664..323eca88281444 100644 --- a/tree/ntuple/v7/test/rfield_class.cxx +++ b/tree/ntuple/v7/test/rfield_class.cxx @@ -233,8 +233,6 @@ TEST(RNTuple, TClassReadRules) { ROOT::TestSupport::CheckDiagsRAII diags; diags.requiredDiag(kWarning, "[ROOT.NTuple]", "ignoring I/O customization rule with non-transient member: a", false); - diags.optionalDiag(kWarning, "[ROOT.NTuple]", "The RNTuple file format will change.", false); - diags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 2", false); FileRaii fileGuard("test_ntuple_tclassrules.root"); char c[4] = {'R', 'O', 'O', 'T'};