From b7846ff4dceec36e344b0f87c48783dffa2c6a32 Mon Sep 17 00:00:00 2001 From: Henrik Edin Date: Tue, 21 Jan 2020 20:23:50 +0000 Subject: SERVER-45583 Unittests are using logv2. Capture log system uses logv2, tests can handle converted log statements. --- src/mongo/db/transaction_participant_test.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/mongo/db/transaction_participant_test.cpp') diff --git a/src/mongo/db/transaction_participant_test.cpp b/src/mongo/db/transaction_participant_test.cpp index 90de929be2d..3e6c30ceb23 100644 --- a/src/mongo/db/transaction_participant_test.cpp +++ b/src/mongo/db/transaction_participant_test.cpp @@ -3292,7 +3292,7 @@ TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterSlowCommit) { std::string expectedTransactionInfo = "transaction " + txnParticipant.getTransactionInfoForLogForTest( opCtx(), &lockerInfo->stats, true, readConcernArgs); - ASSERT_EQUALS(1, countLogLinesContaining(expectedTransactionInfo)); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining(expectedTransactionInfo)); } TEST_F(TransactionsMetricsTest, LogPreparedTransactionInfoAfterSlowCommit) { @@ -3329,7 +3329,7 @@ TEST_F(TransactionsMetricsTest, LogPreparedTransactionInfoAfterSlowCommit) { std::string expectedTransactionInfo = "transaction " + txnParticipant.getTransactionInfoForLogForTest( opCtx(), &lockerInfo->stats, true, readConcernArgs); - ASSERT_EQUALS(1, countLogLinesContaining(expectedTransactionInfo)); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining(expectedTransactionInfo)); } TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterSlowAbort) { @@ -3372,7 +3372,7 @@ TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterSlowAbort) { metricValue, false); - ASSERT_EQUALS(1, countLogLinesContaining(expectedTransactionInfo)); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining(expectedTransactionInfo)); } TEST_F(TransactionsMetricsTest, LogPreparedTransactionInfoAfterSlowAbort) { @@ -3419,7 +3419,7 @@ TEST_F(TransactionsMetricsTest, LogPreparedTransactionInfoAfterSlowAbort) { false, prepareOpTime); - ASSERT_EQUALS(1, countLogLinesContaining(expectedTransactionInfo)); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining(expectedTransactionInfo)); } TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterExceptionInPrepare) { @@ -3465,7 +3465,7 @@ TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterExceptionInPrepare) { metricValue, false); - ASSERT_EQUALS(1, countLogLinesContaining(expectedTransactionInfo)); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining(expectedTransactionInfo)); } TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterSlowStashedAbort) { @@ -3504,7 +3504,7 @@ TEST_F(TransactionsMetricsTest, LogTransactionInfoAfterSlowStashedAbort) { stopCapturingLogMessages(); std::string expectedTransactionInfo = "transaction parameters"; - ASSERT_EQUALS(1, countLogLinesContaining(expectedTransactionInfo)); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining(expectedTransactionInfo)); } TEST_F(TransactionsMetricsTest, LogTransactionInfoVerbosityInfo) { @@ -3525,7 +3525,7 @@ TEST_F(TransactionsMetricsTest, LogTransactionInfoVerbosityInfo) { stopCapturingLogMessages(); // Test that the transaction is not logged. - ASSERT_EQUALS(0, countLogLinesContaining("transaction parameters")); + ASSERT_EQUALS(0, countTextFormatLogLinesContaining("transaction parameters")); } TEST_F(TransactionsMetricsTest, LogTransactionInfoVerbosityDebug) { @@ -3549,7 +3549,7 @@ TEST_F(TransactionsMetricsTest, LogTransactionInfoVerbosityDebug) { setMinimumLoggedSeverity(logger::LogComponent::kTransaction, logger::LogSeverity::Info()); // Test that the transaction is still logged. - ASSERT_EQUALS(1, countLogLinesContaining("transaction parameters")); + ASSERT_EQUALS(1, countTextFormatLogLinesContaining("transaction parameters")); } TEST_F(TxnParticipantTest, RollbackResetsInMemoryStateOfPreparedTransaction) { -- cgit v1.2.1