Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 1 insertions, 26 deletions

diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_random.py b/src/third_party/wiredtiger/test/suite/test_cursor_random.py
index a339ea3d305..3b64532c036 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor_random.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_random.py
@@ -26,7 +26,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-import wiredtiger, wttest, sys
+import wiredtiger, wttest
 from wtdataset import SimpleDataSet, ComplexDataSet, simple_key, simple_value
 from wtscenario import make_scenarios
 
@@ -42,7 +42,6 @@ class test_cursor_random(wttest.WiredTigerTestCase):
         ('not-sample', dict(config='next_random=true'))
     ]
     scenarios = make_scenarios(types, config)
-    expected_warning_msg = 'Eviction took more than 1 minute'
 
     # Check that opening a random cursor on a row-store returns not-supported
     # for methods other than next, reconfigure and reset, and next returns
@@ -111,12 +110,6 @@ class test_cursor_random(wttest.WiredTigerTestCase):
             list.append(cursor.get_key())
         self.assertGreater(len(set(list)), 80)
 
-        # Ignore the eviction generation drain warning as it is possible for eviction to
-        # take longer to evict pages due to overflow items on the page.
-        self.conn.close()
-        if (sys.platform.startswith('darwin')):
-            self.ignoreStdoutPatternIfExists(self.expected_warning_msg)
-
     def test_cursor_random_multiple_insert_records_small(self):
         self.cursor_random_multiple_insert_records(2000)
     def test_cursor_random_multiple_insert_records_large(self):
@@ -144,12 +137,6 @@ class test_cursor_random(wttest.WiredTigerTestCase):
             list.append(cursor.get_key())
         self.assertGreater(len(set(list)), 80)
 
-        # Ignore the eviction generation drain warning as it is possible for eviction to
-        # take longer to evict pages due to overflow items on the page.
-        self.conn.close()
-        if (sys.platform.startswith('darwin')):
-            self.ignoreStdoutPatternIfExists(self.expected_warning_msg)
-
     def test_cursor_random_multiple_page_records_reopen_small(self):
         self.cursor_random_multiple_page_records(2000, True)
     def test_cursor_random_multiple_page_records_reopen_large(self):
@@ -182,12 +169,6 @@ class test_cursor_random(wttest.WiredTigerTestCase):
         for i in range(1,10):
             self.assertEqual(cursor.next(), 0)
 
-        # Ignore the eviction generation drain warning as it is possible for eviction to
-        # take longer to evict pages due to overflow items on the page.
-        self.conn.close()
-        if (sys.platform.startswith('darwin')):
-            self.ignoreStdoutPatternIfExists(self.expected_warning_msg)
-
     # Check that next_random fails in the presence of a set of values, all of
     # which are deleted.
     def test_cursor_random_deleted_all(self):
@@ -205,12 +186,6 @@ class test_cursor_random(wttest.WiredTigerTestCase):
         for i in range(1,10):
             self.assertTrue(cursor.next(), wiredtiger.WT_NOTFOUND)
 
-        # Ignore the eviction generation drain warning as it is possible for eviction to
-        # take longer to evict pages due to overflow items on the page.
-        self.conn.close()
-        if (sys.platform.startswith('darwin')):
-            self.ignoreStdoutPatternIfExists(self.expected_warning_msg)
-
 # Check that opening a random cursor on column-store returns not-supported.
 class test_cursor_random_column(wttest.WiredTigerTestCase):
     type_values = [