diff --git a/test/suite/test_backup11.py b/test/suite/test_backup11.py old mode 100644 new mode 100755 index 14023cb6e..e20b1a37d --- a/test/suite/test_backup11.py +++ b/test/suite/test_backup11.py @@ -43,7 +43,7 @@ class test_backup11(backup_base): conn_config= 'cache_size=1G,log=(enabled,file_max=100K)' dir='backup.dir' # Backup directory name pfx = 'test_backup' - uri="table:test" + uri="lsm:test" def test_backup11(self): self.session.create(self.uri, "key_format=S,value_format=S") @@ -76,7 +76,7 @@ class test_backup11(backup_base): # - Incremental filename must be on duplicate, not primary. # Test this first because we currently do not have a primary open. - config = 'incremental=(file=test.wt)' + config = 'incremental=(file=test-000001.lsm)' msg = "/file name can only be specified on a duplicate/" self.pr("Specify file on primary") self.assertRaisesWithMessage(wiredtiger.WiredTigerError, @@ -100,7 +100,7 @@ class test_backup11(backup_base): # Now test all the error cases with an incremental primary open. # - We cannot specify consolidate on the duplicate cursor. - config = 'incremental=(consolidate=true,file=test.wt)' + config = 'incremental=(consolidate=true,file=test-000001.lsm)' msg = "/consolidation can only be specified on a primary/" self.pr("Test consolidation on a dup") self.pr("=========") @@ -111,7 +111,7 @@ class test_backup11(backup_base): # - We cannot make multiple incremental duplcate backup cursors. # - We cannot duplicate the duplicate backup cursor. - config = 'incremental=(file=test.wt)' + config = 'incremental=(file=test-000001.lsm)' dupc = self.session.open_cursor(None, bkup_c, config) msg = "/already a duplicate backup cursor open/" self.pr("Test multiple dups") @@ -130,7 +130,7 @@ class test_backup11(backup_base): self.pr("Test dup and file target") self.pr("=========") msg = "/cannot be used for/" - config = 'target=("file:test.wt")' + config = 'target=("file:test-000001.lsm")' self.assertRaisesWithMessage(wiredtiger.WiredTigerError, lambda:self.assertEquals(self.session.open_cursor(None, bkup_c, config), 0), msg) @@ -138,7 +138,7 @@ class test_backup11(backup_base): # - We cannot mix block incremental with a log target on the same duplicate. self.pr("Test mixed targets") self.pr("=========") - config = 'incremental=(file=test.wt),target=("log:")' + config = 'incremental=(file=test-000001.lsm),target=("log:")' msg = "/incremental backup incompatible/" self.assertRaisesWithMessage(wiredtiger.WiredTigerError, lambda:self.assertEquals(self.session.open_cursor(None, diff --git a/test/suite/test_backup12.py b/test/suite/test_backup12.py old mode 100644 new mode 100755 index 57769ce88..0a992fa77 --- a/test/suite/test_backup12.py +++ b/test/suite/test_backup12.py @@ -39,9 +39,10 @@ class test_backup12(backup_base): conn_config='cache_size=1G,log=(enabled,file_max=100K)' dir='backup.dir' # Backup directory name logmax="100K" - uri="table:test" - uri2="table:test2" - uri_rem="table:test_rem" + + uri="lsm:test" + uri2="lsm:test2" + uri_rem="lsm:test_rem" pfx = 'test_backup' # Set the key and value big enough that we modify a few blocks. diff --git a/test/suite/test_backup13.py b/test/suite/test_backup13.py old mode 100644 new mode 100755 index c4950f3f6..056ff69a6 --- a/test/suite/test_backup13.py +++ b/test/suite/test_backup13.py @@ -39,7 +39,7 @@ class test_backup13(backup_base): conn_config='cache_size=1G,log=(enabled,file_max=100K)' dir='backup.dir' # Backup directory name logmax="100K" - uri="table:test" + uri="lsm:test" scenarios = make_scenarios([ ('default', dict(sess_cfg='')), diff --git a/test/suite/test_backup16.py b/test/suite/test_backup16.py old mode 100644 new mode 100755 index c7666436b..99041cabc --- a/test/suite/test_backup16.py +++ b/test/suite/test_backup16.py @@ -41,18 +41,18 @@ class test_backup16(backup_base): logmax='100K' # Define the table name and its on-disk file name together. - file1='test1.wt' - uri1='table:test1' - file2='test2.wt' - uri2='table:test2' - file3='test3.wt' - uri3='table:test3' - file4='test4.wt' - uri4='table:test4' - file5='test5.wt' - uri5='table:test5' - file6='test6.wt' - uri6='table:test6' + file1='test1-000001.lsm' + uri1='lsm:test1' + file2='test2-000001.lsm' + uri2='lsm:test2' + file3='test3-000001.lsm' + uri3='lsm:test3' + file4='test4-000001.lsm' + uri4='lsm:test4' + file5='test5-000001.lsm' + uri5='lsm:test5' + file6='test6-000001.lsm' + uri6='lsm:test6' pfx = 'test_backup' # Set the key and value big enough that we modify a few blocks. diff --git a/test/suite/test_backup17.py b/test/suite/test_backup17.py old mode 100644 new mode 100755 index bac540803..59c9cd59b --- a/test/suite/test_backup17.py +++ b/test/suite/test_backup17.py @@ -40,8 +40,8 @@ class test_backup17(backup_base): gran="100K" granval=100*1024 logmax="100K" - uri="table:test" - uri2="table:test2" + uri="lsm:test" + uri2="lsm:test2" conn_config='cache_size=1G,log=(enabled,file_max=%s)' % logmax