diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-01-11 12:07:38 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 01:44:40 +0000 |
| commit | 3ff9871a6d1abbeb22ad551f65f81db54b13e983 (patch) | |
| tree | b712edcb424addc90554c0955c6cb423d6d1e23b | |
| parent | ef77ff3c82d94cbd99db06a463ea808655110f56 (diff) | |
| download | mongo-3ff9871a6d1abbeb22ad551f65f81db54b13e983.tar.gz | |
Import wiredtiger: ace6b2c0f9307ff4cdce339722f0d721fe88d39b from branch mongodb-5.2
ref: 44f59f255c..ace6b2c0f9
for: 5.2.0-rc5
WT-8621 Enable diagnostics for spinlock-gcc and spinlock-pthread-adaptive tests
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/suite/test_rollback_to_stable30.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index a77fea8d77d..07cfe056725 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.2", - "commit": "44f59f255cd2894489339ffe9f3c853ba7e5117e" + "commit": "ace6b2c0f9307ff4cdce339722f0d721fe88d39b" } diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable30.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable30.py index 59379c00408..4e581a329ec 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable30.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable30.py @@ -61,8 +61,12 @@ class test_rollback_to_stable30(wttest.WiredTigerTestCase): self.session.prepare_transaction('prepare_timestamp=' + self.timestamp_str(10)) # Roll back to stable should fail because there's an active transaction. - with self.expectedStdoutPattern('transaction state dump'): - msg = '/rollback_to_stable.*active/' + msg = '/rollback_to_stable.*active/' + if wiredtiger.diagnostic_build(): + with self.expectedStdoutPattern('transaction state dump'): + self.assertRaisesWithMessage(wiredtiger.WiredTigerError, + lambda:self.conn.rollback_to_stable(), msg) + else: self.assertRaisesWithMessage(wiredtiger.WiredTigerError, lambda:self.conn.rollback_to_stable(), msg) |