1 files changed, 41 insertions, 14 deletions

diff --git a/test/suite/test_config04.py b/test/suite/test_config04.py
index 7186bc3a716..dffa7479f1b 100644
--- a/test/suite/test_config04.py
+++ b/test/suite/test_config04.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 os
+import os, shutil
 import wiredtiger, wttest
 from wiredtiger import stat
 
@@ -34,6 +34,7 @@ from wiredtiger import stat
 #    Individually test config options
 class test_config04(wttest.WiredTigerTestCase):
     table_name1 = 'test_config04'
+    log1 = 'WiredTigerLog.0000000001'
     nentries = 100
 
     K = 1024
@@ -86,6 +87,10 @@ class test_config04(wttest.WiredTigerTestCase):
         self.assertEqual(cursor[stat.conn.cache_bytes_max][2], size)
         cursor.close()
 
+    def common_log_test(self, path, dirname):
+        self.common_test('log=(archive=false,enabled,' + path + ')')
+        self.assertTrue(os.path.exists(dirname + os.sep + self.log1))
+
     def test_bad_config(self):
         msg = '/unknown configuration key/'
         self.assertRaisesWithMessage(wiredtiger.WiredTigerError,
@@ -168,24 +173,46 @@ class test_config04(wttest.WiredTigerTestCase):
         self.assertRaisesWithMessage(wiredtiger.WiredTigerError,
             lambda: self.wiredtiger_open('.', '(create='), msg)
 
-    def test_session_max(self):
-        # Note: There isn't any direct way to know that this was set,
-        # but we'll have a separate functionality test to test for
-        # this indirectly.
-        self.common_test('session_max=99')
-
-    def test_multiprocess(self):
-        self.common_test('multiprocess')
-        # TODO: how do we verify that it was set?
-
     def test_error_prefix(self):
         self.common_test('error_prefix="MyOwnPrefix"')
         # TODO: how do we verify that it was set?
 
     def test_logging(self):
-        self.common_test('log=(enabled=true)')
-        # TODO: how do we verify that it was set?  For this we could look
-        # for the existence of the log file in the home dir.
+        # Test variations on the log configuration.  The log test takes
+        # a configuration string as the first arg and the directory pathname
+        # to confirm the existence of the log file.  For now we're testing
+        # the log pathname only.
+        #
+        # Test the default in the home directory.
+        self.common_log_test('', '.')
+        self.conn.close()
+
+        # Test a subdir of the home directory.
+        logdirname = 'logdir'
+        logdir = '.' + os.sep + logdirname
+        os.mkdir(logdir)
+        confstr = 'path=' + logdirname
+        self.common_log_test(confstr, logdir)
+        self.conn.close()
+
+        # Test an absolute path directory.
+        if os.name == 'posix':
+            logdir = '/tmp/logdir'
+            os.mkdir(logdir)
+            confstr = 'path=' + logdir
+            self.common_log_test(confstr, logdir)
+            self.conn.close()
+            shutil.rmtree(logdir, ignore_errors=True)
+
+    def test_multiprocess(self):
+        self.common_test('multiprocess')
+        # TODO: how do we verify that it was set?
+
+    def test_session_max(self):
+        # Note: There isn't any direct way to know that this was set,
+        # but we'll have a separate functionality test to test for
+        # this indirectly.
+        self.common_test('session_max=99')
 
     def test_transactional(self):
         # Note: this will have functional tests in the future.