Import wiredtiger: 74a07bf78520fb1e3ed08b341c2c36b795e567a1 from branch mongodb-5.1

ref: 51a5c5ff5b..74a07bf785
for: 5.1.0-rc1

WT-5939       Fix naming conflict resulting in "cannot remove directory" error in test_config06 (OSX only)

2 files changed, 7 insertions, 2 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index abf371b6693..31202beda0d 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.1",
-    "commit": "51a5c5ff5b0ceea341f70a386fff5a9f68d2edac"
+    "commit": "74a07bf78520fb1e3ed08b341c2c36b795e567a1"
 }
diff --git a/src/third_party/wiredtiger/test/suite/wttest.py b/src/third_party/wiredtiger/test/suite/wttest.py
index 01c4f315f9c..07e5b0b6610 100755
--- a/src/third_party/wiredtiger/test/suite/wttest.py
+++ b/src/third_party/wiredtiger/test/suite/wttest.py
@@ -780,7 +780,12 @@ class WiredTigerTestCase(unittest.TestCase):
         'test_file.test_file.test_funcname(scen1.scen2.scen3)'.
         So transform '(', but remove final ')'.
         """
-        return self.shortid().translate(str.maketrans('($[]/ ','______', ')'))
+        name = self.shortid().translate(str.maketrans('($[]/ ','______', ')'))
+
+        # On OS/X, we can get name conflicts if names differ by case. Upper
+        # case letters are uncommon in our python class and method names, so
+        # we lowercase them and prefix with '@', e.g. "AbC" -> "@ab@c".
+        return re.sub(r'[A-Z]', lambda x: '@' + x.group(0).lower(), name)
 
     def className(self):
         return self.__class__.__name__