Merge branch 'develop' into wt-2223

2 files changed, 13 insertions, 2 deletions

diff --git a/test/format/backup.c b/test/format/backup.c
index f0d3f8df58f..977b44c2e11 100644
--- a/test/format/backup.c
+++ b/test/format/backup.c
@@ -159,6 +159,11 @@ backup(void *arg)
 		testutil_check(backup_cursor->close(backup_cursor));
 		testutil_check(pthread_rwlock_unlock(&g.backup_lock));
 
+		/* After an incremental backup, truncate the log files. */
+		if (incremental)
+			testutil_check(session->truncate(
+			    session, "log:", backup_cursor, NULL, NULL));
+
 		/*
 		 * If automatic log archival isn't configured, optionally do
 		 * incremental backups after each full backup. If we're not
diff --git a/test/suite/test_reconfig02.py b/test/suite/test_reconfig02.py
index aee8ee4458b..85a9ceb2a34 100644
--- a/test/suite/test_reconfig02.py
+++ b/test/suite/test_reconfig02.py
@@ -74,9 +74,15 @@ class test_reconfig02(wttest.WiredTigerTestCase):
 
         # Now turn on pre-allocation.  Sleep to give the worker thread
         # a chance to run and verify pre-allocated log files exist.
+        #
+        # Potentially loop a few times in case it is a very slow system.
         self.conn.reconfigure("log=(prealloc=true)")
-        time.sleep(2)
-        prep_logs = fnmatch.filter(os.listdir('.'), "*Prep*")
+        for x in xrange(0, 20):
+            time.sleep(1)
+            prep_logs = fnmatch.filter(os.listdir('.'), "*Prep*")
+            if len(prep_logs) != 0:
+                break
+
         self.assertNotEqual(0, len(prep_logs))
 
     # Logging starts on, but archive is off.  Verify it is off.