summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEtienne Petrel <etienne.petrel@mongodb.com>2021-07-27 06:27:12 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-07-27 06:49:38 +0000
commit8eef64790acfe95f5a74de4694b05d93d2715ed5 (patch)
tree73e5b5813c797fa70950edfbc88c40a8eebafb77 /src
parentccca1a824624f2c83f38fa42b507f836ceb3563f (diff)
downloadmongo-8eef64790acfe95f5a74de4694b05d93d2715ed5.tar.gz
Import wiredtiger: 29d7fa582f8543300d59a4d710672b88b0e65ef3 from branch mongodb-master
ref: d657d0e944..29d7fa582f for: 5.1.0 WT-7893 Remove ignored message from wiredtiger_open in test_encrypt08
Diffstat (limited to 'src')
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt08.py9
2 files changed, 5 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 5333e723cf7..6246893cdf0 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-master",
- "commit": "d657d0e944af71b6a19800a479aee791edb78861"
+ "commit": "29d7fa582f8543300d59a4d710672b88b0e65ef3"
}
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt08.py b/src/third_party/wiredtiger/test/suite/test_encrypt08.py
index e15dd851908..5e4e065d3f3 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt08.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt08.py
@@ -84,11 +84,10 @@ class test_encrypt08(wttest.WiredTigerTestCase):
def test_encrypt(self):
sysconfig = 'encryption=(name=sodium,{0}),'.format(self.sys_encrypt)
- with self.expectedStdoutPattern('Failed wiredtiger_open'):
- self.assertRaisesWithMessage(wiredtiger.WiredTigerError,
- lambda:
- self.reopen_conn(config = sysconfig),
- self.msg)
+ self.assertRaisesWithMessage(wiredtiger.WiredTigerError,
+ lambda:
+ self.reopen_conn(config = sysconfig),
+ self.msg)
if __name__ == '__main__':
wttest.run()