Merge branch 'mongodb-3.4' into mongodb-3.2mongodb-3.2.5

1 files changed, 5 insertions, 9 deletions

diff --git a/test/suite/test_backup05.py b/test/suite/test_backup05.py
index 8b176d0f7d7..991a9f71b19 100644
--- a/test/suite/test_backup05.py
+++ b/test/suite/test_backup05.py
@@ -44,14 +44,6 @@ class test_backup05(wttest.WiredTigerTestCase, suite_subprocess):
     create_params = 'key_format=i,value_format=i'
     freq = 5
 
-    def copy_windows(self, olddir, newdir):
-        os.mkdir(newdir)
-        for fname in os.listdir(olddir):
-            fullname = os.path.join(olddir, fname)
-            # Skip lock file on Windows since it is locked
-            if os.path.isfile(fullname) and "WiredTiger.lock" not in fullname:
-                shutil.copy(fullname, newdir)
-
     def check_manual_backup(self, i, olddir, newdir):
         ''' Simulate a manual backup from olddir and restart in newdir. '''
         self.session.checkpoint()
@@ -71,7 +63,7 @@ class test_backup05(wttest.WiredTigerTestCase, suite_subprocess):
         session.verify(self.uri)
         conn.close()
 
-    def test_backup(self):
+    def backup(self):
         '''Check manual fsyncLock backup strategy'''
 
         # Here's the strategy:
@@ -95,5 +87,9 @@ class test_backup05(wttest.WiredTigerTestCase, suite_subprocess):
             else:
                 self.session.verify(self.uri)
 
+    def test_backup(self):
+        with self.expectedStdoutPattern('Recreating metadata'):
+            self.backup()
+
 if __name__ == '__main__':
     wttest.run()