diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-02-15 08:33:11 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-14 22:27:59 +0000 |
| commit | 6f2bd86422d0a5ec9503df6b6ea434b27844b2ee (patch) | |
| tree | 1e88ea62680874d77da0255256f8827dda7d317e | |
| parent | 7aeb1084fcc5ed1f4ecdf3d5f06f3832e8cbd0ad (diff) | |
| download | mongo-6f2bd86422d0a5ec9503df6b6ea434b27844b2ee.tar.gz | |
Import wiredtiger: 6fb2e8db721720c4332664b79f8b261b059dcc08 from branch mongodb-master
ref: 46826fd9aa..6fb2e8db72
for: 5.3.0
WT-8807 Remove unused imports from Python tests
284 files changed, 256 insertions, 432 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 7e541cfb9e4..8fb761d94b9 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "46826fd9aa3835cf2a7bcd026fa4cf0b8554d6fc" + "commit": "6fb2e8db721720c4332664b79f8b261b059dcc08" } diff --git a/src/third_party/wiredtiger/test/suite/test_alter01.py b/src/third_party/wiredtiger/test/suite/test_alter01.py index d4a197ff1c3..d99733f9a12 100644 --- a/src/third_party/wiredtiger/test/suite/test_alter01.py +++ b/src/third_party/wiredtiger/test/suite/test_alter01.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 +import wttest from wtscenario import make_scenarios # test_alter01.py diff --git a/src/third_party/wiredtiger/test/suite/test_alter02.py b/src/third_party/wiredtiger/test/suite/test_alter02.py index c6683521934..e01d466f156 100755 --- a/src/third_party/wiredtiger/test/suite/test_alter02.py +++ b/src/third_party/wiredtiger/test/suite/test_alter02.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 sys, wiredtiger, wttest +import wiredtiger, wttest from wtscenario import make_scenarios # test_alter02.py diff --git a/src/third_party/wiredtiger/test/suite/test_alter03.py b/src/third_party/wiredtiger/test/suite/test_alter03.py index f517721b26f..73c55872a2a 100644 --- a/src/third_party/wiredtiger/test/suite/test_alter03.py +++ b/src/third_party/wiredtiger/test/suite/test_alter03.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -from wtscenario import make_scenarios # test_alter03.py # Check if app_metadata can be altered. diff --git a/src/third_party/wiredtiger/test/suite/test_alter04.py b/src/third_party/wiredtiger/test/suite/test_alter04.py index ac8bac47fa9..d2d78acf9f6 100644 --- a/src/third_party/wiredtiger/test/suite/test_alter04.py +++ b/src/third_party/wiredtiger/test/suite/test_alter04.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 +import wttest from wtscenario import make_scenarios # test_alter04.py diff --git a/src/third_party/wiredtiger/test/suite/test_assert05.py b/src/third_party/wiredtiger/test/suite/test_assert05.py index 2dc0fc1788f..9ca5ee02fff 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert05.py +++ b/src/third_party/wiredtiger/test/suite/test_assert05.py @@ -31,7 +31,7 @@ # from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_assert05(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_assert07.py b/src/third_party/wiredtiger/test/suite/test_assert07.py index a29fc165037..48cf2a9d9a4 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert07.py +++ b/src/third_party/wiredtiger/test/suite/test_assert07.py @@ -32,7 +32,7 @@ # from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_autoclose.py b/src/third_party/wiredtiger/test/suite/test_autoclose.py index 5d3b21b2764..7259c29c30f 100755 --- a/src/third_party/wiredtiger/test/suite/test_autoclose.py +++ b/src/third_party/wiredtiger/test/suite/test_autoclose.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 +import wttest # test_autoclose class test_autoclose(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_backup01.py b/src/third_party/wiredtiger/test/suite/test_backup01.py index aa30471706e..98acd1e83d0 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup01.py +++ b/src/third_party/wiredtiger/test/suite/test_backup01.py @@ -32,10 +32,8 @@ # [END_TAGS] # -import glob import os import shutil -import string import time from wtbackup import backup_base import wiredtiger diff --git a/src/third_party/wiredtiger/test/suite/test_backup02.py b/src/third_party/wiredtiger/test/suite/test_backup02.py index 847c7e7b828..69efae16e4a 100755 --- a/src/third_party/wiredtiger/test/suite/test_backup02.py +++ b/src/third_party/wiredtiger/test/suite/test_backup02.py @@ -26,8 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import queue, threading, time, wiredtiger, wttest -from wtthread import backup_thread, checkpoint_thread, op_thread +import queue, threading, time, wttest +from wtthread import backup_thread, op_thread # test_backup02.py # Run background checkpoints and backups repeatedly while doing inserts diff --git a/src/third_party/wiredtiger/test/suite/test_backup03.py b/src/third_party/wiredtiger/test/suite/test_backup03.py index f2936071548..db6d23fff6c 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup03.py +++ b/src/third_party/wiredtiger/test/suite/test_backup03.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 glob, os, shutil, string +import os, shutil import wiredtiger from wtbackup import backup_base from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_backup04.py b/src/third_party/wiredtiger/test/suite/test_backup04.py index df8749ba058..25123024730 100755 --- a/src/third_party/wiredtiger/test/suite/test_backup04.py +++ b/src/third_party/wiredtiger/test/suite/test_backup04.py @@ -26,12 +26,10 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import threading, time, wiredtiger -import glob, os, shutil +import os from wtbackup import backup_base -from wtdataset import SimpleDataSet, simple_key +from wtdataset import simple_key from wtscenario import make_scenarios -from wtthread import op_thread # test_backup04.py # Utilities: wt backup diff --git a/src/third_party/wiredtiger/test/suite/test_backup05.py b/src/third_party/wiredtiger/test/suite/test_backup05.py index b83a18daed0..69efc3078a0 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup05.py +++ b/src/third_party/wiredtiger/test/suite/test_backup05.py @@ -33,7 +33,7 @@ # manipulations. Manually copy the directory and verify it. # -import fnmatch, os, shutil, time +import os from suite_subprocess import suite_subprocess from helper import copy_wiredtiger_home import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_backup06.py b/src/third_party/wiredtiger/test/suite/test_backup06.py index ad72ed30362..87fd879879d 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup06.py +++ b/src/third_party/wiredtiger/test/suite/test_backup06.py @@ -27,8 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. import os -import shutil -import string from wtbackup import backup_base import wiredtiger, wttest from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_backup07.py b/src/third_party/wiredtiger/test/suite/test_backup07.py index b5317435eac..3569cdc588f 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup07.py +++ b/src/third_party/wiredtiger/test/suite/test_backup07.py @@ -26,11 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest -import os, shutil -from helper import compare_files +import wttest +import os from wtbackup import backup_base -from wtdataset import simple_key from wtscenario import make_scenarios # test_backup07.py diff --git a/src/third_party/wiredtiger/test/suite/test_backup09.py b/src/third_party/wiredtiger/test/suite/test_backup09.py index ba099fe7914..c9b40e46094 100755 --- a/src/third_party/wiredtiger/test/suite/test_backup09.py +++ b/src/third_party/wiredtiger/test/suite/test_backup09.py @@ -30,7 +30,7 @@ # Verify opening a backup cursor forces a log file switch. # -import os, shutil, stat +import os, shutil import helper, wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_backup10.py b/src/third_party/wiredtiger/test/suite/test_backup10.py index 2c5c78c8595..0d31522294e 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup10.py +++ b/src/third_party/wiredtiger/test/suite/test_backup10.py @@ -27,10 +27,8 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -import os, shutil -from helper import compare_files +import os from wtbackup import backup_base -from wtdataset import simple_key from wtscenario import make_scenarios # test_backup10.py diff --git a/src/third_party/wiredtiger/test/suite/test_backup11.py b/src/third_party/wiredtiger/test/suite/test_backup11.py index 14023cb6ee3..445026cb27a 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup11.py +++ b/src/third_party/wiredtiger/test/suite/test_backup11.py @@ -31,11 +31,8 @@ # [END_TAGS] import wiredtiger, wttest -import os, shutil -from helper import compare_files +import os from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios # test_backup11.py # Test cursor backup with a duplicate backup cursor. diff --git a/src/third_party/wiredtiger/test/suite/test_backup12.py b/src/third_party/wiredtiger/test/suite/test_backup12.py index 57769ce8810..506ba76e028 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup12.py +++ b/src/third_party/wiredtiger/test/suite/test_backup12.py @@ -26,12 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest -import os, shutil -from helper import compare_files +import wttest +import os from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios # test_backup12.py # Test cursor backup with a block-based incremental cursor. diff --git a/src/third_party/wiredtiger/test/suite/test_backup13.py b/src/third_party/wiredtiger/test/suite/test_backup13.py index c4950f3f621..14d8817416b 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup13.py +++ b/src/third_party/wiredtiger/test/suite/test_backup13.py @@ -27,10 +27,9 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -import os, shutil -from helper import compare_files, simulate_crash_restart +import os +from helper import simulate_crash_restart from wtbackup import backup_base -from wtdataset import simple_key from wtscenario import make_scenarios # test_backup13.py diff --git a/src/third_party/wiredtiger/test/suite/test_backup14.py b/src/third_party/wiredtiger/test/suite/test_backup14.py index 862c2187420..23758099fbd 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup14.py +++ b/src/third_party/wiredtiger/test/suite/test_backup14.py @@ -26,12 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger -import os, shutil +import os from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios -import glob # test_backup14.py # Test cursor backup with a block-based incremental cursor. diff --git a/src/third_party/wiredtiger/test/suite/test_backup16.py b/src/third_party/wiredtiger/test/suite/test_backup16.py index c7666436bf0..c54767af745 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup16.py +++ b/src/third_party/wiredtiger/test/suite/test_backup16.py @@ -27,11 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -import os, shutil -from helper import compare_files from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios # test_backup16.py # Ensure incremental backup doesn't copy unnecessary files. diff --git a/src/third_party/wiredtiger/test/suite/test_backup17.py b/src/third_party/wiredtiger/test/suite/test_backup17.py index bac540803dc..3aa3b38b2d1 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup17.py +++ b/src/third_party/wiredtiger/test/suite/test_backup17.py @@ -26,12 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest -import os, shutil -from helper import compare_files +import wttest +import os from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios # test_backup17.py # Test cursor backup with a block-based incremental cursor and consolidate. diff --git a/src/third_party/wiredtiger/test/suite/test_backup18.py b/src/third_party/wiredtiger/test/suite/test_backup18.py index 8ce128a47a0..25e230f18d6 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup18.py +++ b/src/third_party/wiredtiger/test/suite/test_backup18.py @@ -27,11 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -import os, shutil -from helper import compare_files from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios # test_backup18.py # Test backup:query_id API. diff --git a/src/third_party/wiredtiger/test/suite/test_backup19.py b/src/third_party/wiredtiger/test/suite/test_backup19.py index 0db730ab7a8..725fab33998 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup19.py +++ b/src/third_party/wiredtiger/test/suite/test_backup19.py @@ -26,12 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger -import os, shutil +import os from wtbackup import backup_base -from wtdataset import simple_key -from wtscenario import make_scenarios -import glob # test_backup19.py # Test cursor backup with a block-based incremental cursor source id only. diff --git a/src/third_party/wiredtiger/test/suite/test_backup20.py b/src/third_party/wiredtiger/test/suite/test_backup20.py index 51062893a47..4b62928bfeb 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup20.py +++ b/src/third_party/wiredtiger/test/suite/test_backup20.py @@ -26,11 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest -import os, shutil -from helper import compare_files +import wttest from suite_subprocess import suite_subprocess -from wtdataset import simple_key from wtscenario import make_scenarios # test_backup20.py diff --git a/src/third_party/wiredtiger/test/suite/test_backup21.py b/src/third_party/wiredtiger/test/suite/test_backup21.py index 42e2405c22c..ab10e895e40 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup21.py +++ b/src/third_party/wiredtiger/test/suite/test_backup21.py @@ -26,9 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import queue, threading, wiredtiger, wttest +import queue, threading, wttest from wtbackup import backup_base -from wtscenario import make_scenarios from wtthread import op_thread # test_backup21.py diff --git a/src/third_party/wiredtiger/test/suite/test_backup22.py b/src/third_party/wiredtiger/test/suite/test_backup22.py index 06d1a81ef7c..97946c77783 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup22.py +++ b/src/third_party/wiredtiger/test/suite/test_backup22.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, os +import os from wtscenario import make_scenarios from wtbackup import backup_base diff --git a/src/third_party/wiredtiger/test/suite/test_backup23.py b/src/third_party/wiredtiger/test/suite/test_backup23.py index 39f5c27390d..2d1d2a65b65 100755 --- a/src/third_party/wiredtiger/test/suite/test_backup23.py +++ b/src/third_party/wiredtiger/test/suite/test_backup23.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home from suite_subprocess import suite_subprocess import os import shutil diff --git a/src/third_party/wiredtiger/test/suite/test_base02.py b/src/third_party/wiredtiger/test/suite/test_base02.py index 2c593f04274..4c1aa71d545 100644 --- a/src/third_party/wiredtiger/test/suite/test_base02.py +++ b/src/third_party/wiredtiger/test/suite/test_base02.py @@ -35,7 +35,7 @@ # import json -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # Test configuration strings. diff --git a/src/third_party/wiredtiger/test/suite/test_base03.py b/src/third_party/wiredtiger/test/suite/test_base03.py index f1f2981cd6d..cfa5c475a1e 100644 --- a/src/third_party/wiredtiger/test/suite/test_base03.py +++ b/src/third_party/wiredtiger/test/suite/test_base03.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 +import wttest # test_base03.py # Cursor operations diff --git a/src/third_party/wiredtiger/test/suite/test_base05.py b/src/third_party/wiredtiger/test/suite/test_base05.py index 6e4f9e9c535..14c49eba2ff 100755 --- a/src/third_party/wiredtiger/test/suite/test_base05.py +++ b/src/third_party/wiredtiger/test/suite/test_base05.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 +import wttest from wtscenario import make_scenarios # test_base05.py diff --git a/src/third_party/wiredtiger/test/suite/test_bug001.py b/src/third_party/wiredtiger/test/suite/test_bug001.py index 9d4e7e96c6b..d780abf24f0 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug001.py +++ b/src/third_party/wiredtiger/test/suite/test_bug001.py @@ -29,7 +29,7 @@ # test_bug001.py # Regression tests. -import wiredtiger, wttest +import wttest # Regression tests. class test_bug001(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_bug003.py b/src/third_party/wiredtiger/test/suite/test_bug003.py index cc723b19d8e..caeb9d25dd8 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug003.py +++ b/src/third_party/wiredtiger/test/suite/test_bug003.py @@ -29,7 +29,7 @@ # test_bug003.py # Regression tests. -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # Regression tests. diff --git a/src/third_party/wiredtiger/test/suite/test_bug004.py b/src/third_party/wiredtiger/test/suite/test_bug004.py index fc89e4dfcbd..4338846e049 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug004.py +++ b/src/third_party/wiredtiger/test/suite/test_bug004.py @@ -33,8 +33,8 @@ # test_bug004.py # Regression tests. -import wiredtiger, wttest -from wtdataset import SimpleDataSet, simple_key, simple_value +import wttest +from wtdataset import simple_key, simple_value from wtscenario import make_scenarios # Check to make sure we see the right versions of overflow keys and values diff --git a/src/third_party/wiredtiger/test/suite/test_bug005.py b/src/third_party/wiredtiger/test/suite/test_bug005.py index 469b4371659..9b7be91be89 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug005.py +++ b/src/third_party/wiredtiger/test/suite/test_bug005.py @@ -33,8 +33,8 @@ # test_bug005.py # Regression tests. -import wiredtiger, wttest -from wtdataset import SimpleDataSet, simple_key, simple_value +import wttest +from wtdataset import simple_key, simple_value # Check that verify works when the file has additional data after the last # checkpoint. diff --git a/src/third_party/wiredtiger/test/suite/test_bug006.py b/src/third_party/wiredtiger/test/suite/test_bug006.py index a073bfb989e..835a3caa506 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug006.py +++ b/src/third_party/wiredtiger/test/suite/test_bug006.py @@ -30,7 +30,7 @@ # Regression tests. import wiredtiger, wttest -from wtdataset import SimpleDataSet, simple_key, simple_value +from wtdataset import simple_key, simple_value from wtscenario import make_scenarios # Check that verify and salvage both raise exceptions if there is an open diff --git a/src/third_party/wiredtiger/test/suite/test_bug009.py b/src/third_party/wiredtiger/test/suite/test_bug009.py index fba0032aad9..52d15471b28 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug009.py +++ b/src/third_party/wiredtiger/test/suite/test_bug009.py @@ -31,8 +31,7 @@ # when figuring out how to split pages # -import wiredtiger, wttest -from wiredtiger import stat +import wttest class test_bug009(wttest.WiredTigerTestCase): name = 'test_bug009' diff --git a/src/third_party/wiredtiger/test/suite/test_bug010.py b/src/third_party/wiredtiger/test/suite/test_bug010.py index 56c5574578e..23b261b94fc 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug010.py +++ b/src/third_party/wiredtiger/test/suite/test_bug010.py @@ -31,8 +31,8 @@ # did not write all updates out. # -import wiredtiger, wttest, wtthread -import threading, time +import wttest, wtthread +import threading class test_bug010(wttest.WiredTigerTestCase): name = 'test_bug010' diff --git a/src/third_party/wiredtiger/test/suite/test_bug011.py b/src/third_party/wiredtiger/test/suite/test_bug011.py index 394f988c8d7..7b695fe6126 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug011.py +++ b/src/third_party/wiredtiger/test/suite/test_bug011.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 random, wiredtiger, wttest +import random, wttest from wtdataset import SimpleDataSet # test_bug011.py diff --git a/src/third_party/wiredtiger/test/suite/test_bug014.py b/src/third_party/wiredtiger/test/suite/test_bug014.py index 1317a7e56fa..20ec9aa6a84 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug014.py +++ b/src/third_party/wiredtiger/test/suite/test_bug014.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 +import wttest from wtdataset import SimpleDataSet from helper import copy_wiredtiger_home diff --git a/src/third_party/wiredtiger/test/suite/test_bug015.py b/src/third_party/wiredtiger/test/suite/test_bug015.py index c18532febbd..cf01ff101a8 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug015.py +++ b/src/third_party/wiredtiger/test/suite/test_bug015.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 +import wttest # test_bug015.py # JIRA WT-2162: index drop in a certain order triggers NULL pointer deref diff --git a/src/third_party/wiredtiger/test/suite/test_bug019.py b/src/third_party/wiredtiger/test/suite/test_bug019.py index e2da73c8d7f..ef0cb698f0e 100755 --- a/src/third_party/wiredtiger/test/suite/test_bug019.py +++ b/src/third_party/wiredtiger/test/suite/test_bug019.py @@ -27,9 +27,8 @@ # OTHER DEALINGS IN THE SOFTWARE. import fnmatch, os, time -import wiredtiger, wttest +import wttest from wiredtiger import stat -from wtdataset import SimpleDataSet # test_bug019.py # Test that pre-allocating log files only pre-allocates a small number. diff --git a/src/third_party/wiredtiger/test/suite/test_bug020.py b/src/third_party/wiredtiger/test/suite/test_bug020.py index b47de04e663..5edf9724e43 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug020.py +++ b/src/third_party/wiredtiger/test/suite/test_bug020.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import os -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet # test_bug020.py diff --git a/src/third_party/wiredtiger/test/suite/test_bug021.py b/src/third_party/wiredtiger/test/suite/test_bug021.py index b1ba40a4cff..e19287bb451 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug021.py +++ b/src/third_party/wiredtiger/test/suite/test_bug021.py @@ -29,7 +29,7 @@ # test_bug021.py # Fixed-length column store implicit record operations test. -import wiredtiger, wttest +import wttest # Fixed-length column store implicit record operations test. class test_bug021(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_bug023.py b/src/third_party/wiredtiger/test/suite/test_bug023.py index 7e5ab72010e..1cd112e4820 100755 --- a/src/third_party/wiredtiger/test/suite/test_bug023.py +++ b/src/third_party/wiredtiger/test/suite/test_bug023.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home from suite_subprocess import suite_subprocess import os import shutil diff --git a/src/third_party/wiredtiger/test/suite/test_bug024.py b/src/third_party/wiredtiger/test/suite/test_bug024.py index 53e09543435..c3afc1b70db 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug024.py +++ b/src/third_party/wiredtiger/test/suite/test_bug024.py @@ -30,8 +30,7 @@ # connection_api:turtle_file # [END_TAGS] -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet import os, shutil diff --git a/src/third_party/wiredtiger/test/suite/test_bug025.py b/src/third_party/wiredtiger/test/suite/test_bug025.py index 366d650f16e..0b8ef2b8e6d 100755 --- a/src/third_party/wiredtiger/test/suite/test_bug025.py +++ b/src/third_party/wiredtiger/test/suite/test_bug025.py @@ -26,10 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import ComplexDataSet -import os, shutil +import os # test_bug025.py # WT-7208: After a missing index is accessed, we return an error. diff --git a/src/third_party/wiredtiger/test/suite/test_bug027.py b/src/third_party/wiredtiger/test/suite/test_bug027.py index 472e467189e..eb0a6bdaeed 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug027.py +++ b/src/third_party/wiredtiger/test/suite/test_bug027.py @@ -29,7 +29,6 @@ import wttest from helper import simulate_crash_restart from wtdataset import SimpleDataSet -from wtscenario import make_scenarios # test_bug027.py # Attempt to create a snapshot with more than 256 transactions in it. diff --git a/src/third_party/wiredtiger/test/suite/test_bulk01.py b/src/third_party/wiredtiger/test/suite/test_bulk01.py index 7f2a8ee9d55..76893efd9ce 100755 --- a/src/third_party/wiredtiger/test/suite/test_bulk01.py +++ b/src/third_party/wiredtiger/test/suite/test_bulk01.py @@ -31,7 +31,7 @@ # import wiredtiger, wttest -from wtdataset import SimpleDataSet, simple_key, simple_value +from wtdataset import simple_key, simple_value from wtscenario import make_scenarios # Smoke test bulk-load. diff --git a/src/third_party/wiredtiger/test/suite/test_bulk02.py b/src/third_party/wiredtiger/test/suite/test_bulk02.py index cd81f2cbb8b..107c0dc9417 100644 --- a/src/third_party/wiredtiger/test/suite/test_bulk02.py +++ b/src/third_party/wiredtiger/test/suite/test_bulk02.py @@ -29,11 +29,9 @@ # test_bulk02.py # Bulk-load testing. -import shutil, os import wiredtiger, wttest -from helper import confirm_empty from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, simple_key, simple_value +from wtdataset import simple_key, simple_value from wtscenario import make_scenarios # test_bulkload_checkpoint diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint02.py b/src/third_party/wiredtiger/test/suite/test_checkpoint02.py index dc1662262f7..8760b5d5711 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint02.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint02.py @@ -31,7 +31,7 @@ # [END_TAGS] # -import queue, threading, time, wiredtiger, wttest +import queue, threading, wttest from wtthread import checkpoint_thread, op_thread from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint03.py b/src/third_party/wiredtiger/test/suite/test_checkpoint03.py index 809e2288e31..d83049cb8ad 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint03.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint03.py @@ -35,7 +35,7 @@ # from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint04.py b/src/third_party/wiredtiger/test/suite/test_checkpoint04.py index 4cf1ce530d6..bec2cf8dd8e 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint04.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint04.py @@ -29,7 +29,7 @@ # test_checkpoint04.py # Test that the checkpoints timing statistics are populated as expected. -import wiredtiger, wttest +import wttest from wiredtiger import stat from wtdataset import SimpleDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint05.py b/src/third_party/wiredtiger/test/suite/test_checkpoint05.py index 17171e5b884..3747793adeb 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint05.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint05.py @@ -32,7 +32,7 @@ # should get deleted as usual. import time -import wiredtiger, wttest +import wttest class test_checkpoint05(wttest.WiredTigerTestCase): conn_config = 'create,cache_size=100MB,log=(enabled=true,file_max=100K,remove=false)' diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint06.py b/src/third_party/wiredtiger/test/suite/test_checkpoint06.py index 6570bda56fa..b146acc0c23 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint06.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint06.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import time -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_checkpoint06.py diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint07.py b/src/third_party/wiredtiger/test/suite/test_checkpoint07.py index 0a03a6787a0..f323da6d2f4 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint07.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint07.py @@ -29,9 +29,8 @@ # test_checkpoint07.py # Test that the checkpoints timing statistics are populated as expected. -import wiredtiger, wttest +import wttest from wiredtiger import stat -from wtdataset import SimpleDataSet class test_checkpoint07(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint08.py b/src/third_party/wiredtiger/test/suite/test_checkpoint08.py index 200a4d73535..1727c077fce 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint08.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint08.py @@ -33,9 +33,8 @@ # test_checkpoint08.py # Test that the btree checkpoint is not skipped if there are obsolete pages. -import wiredtiger, wttest +import wttest from wiredtiger import stat -from wtdataset import SimpleDataSet class test_checkpoint08(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py index 50be13e7d61..10840ffb976 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py @@ -31,10 +31,9 @@ # [END_TAGS] from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios -from wiredtiger import stat # test_checkpoint_snapshot01.py # Checkpoint snapshot - Create multiple sessions which creates snapshots and diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py index 7a011aa181d..c1f3f070944 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py @@ -26,8 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, threading, time -from wtthread import checkpoint_thread, op_thread +import os, shutil, threading, time +from wtthread import checkpoint_thread from helper import simulate_crash_restart import wiredtiger, wttest from wtdataset import SimpleDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py index 9ce0a92fb42..dee941908fa 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py @@ -30,10 +30,8 @@ # rollback_to_stable # [END_TAGS] -import fnmatch, os, shutil, threading, time -from wtthread import checkpoint_thread, op_thread from helper import simulate_crash_restart -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py index c5e8d67356a..5f3d24076f3 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.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 fnmatch, os, shutil, threading, time +import os, shutil import wiredtiger, wttest from wtbackup import backup_base from wtdataset import SimpleDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_collator.py b/src/third_party/wiredtiger/test/suite/test_collator.py index b1dcd9b731e..64c0e9151d3 100644 --- a/src/third_party/wiredtiger/test/suite/test_collator.py +++ b/src/third_party/wiredtiger/test/suite/test_collator.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wttest # test_collator.py # Test indices using a custom extractor and collator. diff --git a/src/third_party/wiredtiger/test/suite/test_compact01.py b/src/third_party/wiredtiger/test/suite/test_compact01.py index ca1cbc9f22b..0d65e47c308 100755 --- a/src/third_party/wiredtiger/test/suite/test_compact01.py +++ b/src/third_party/wiredtiger/test/suite/test_compact01.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 +import wttest from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet, ComplexDataSet from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_compact03.py b/src/third_party/wiredtiger/test/suite/test_compact03.py index 19a1b4a22d5..ed5cb528d6b 100644 --- a/src/third_party/wiredtiger/test/suite/test_compact03.py +++ b/src/third_party/wiredtiger/test/suite/test_compact03.py @@ -31,7 +31,7 @@ # end of file. # -import time, wiredtiger, wttest +import wttest from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_compat01.py b/src/third_party/wiredtiger/test/suite/test_compat01.py index 38b3b4bada3..3979693a16a 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat01.py +++ b/src/third_party/wiredtiger/test/suite/test_compat01.py @@ -32,7 +32,7 @@ import fnmatch, os import wiredtiger, wttest from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, simple_key +from wtdataset import SimpleDataSet from wtscenario import make_scenarios class test_compat01(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_compat02.py b/src/third_party/wiredtiger/test/suite/test_compat02.py index 0d234756436..8f4fee9569d 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat02.py +++ b/src/third_party/wiredtiger/test/suite/test_compat02.py @@ -29,10 +29,8 @@ # test_compat02.py # Check compatibility API -import fnmatch, os import wiredtiger, wttest from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, simple_key from wtscenario import make_scenarios class test_compat02(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_compat03.py b/src/third_party/wiredtiger/test/suite/test_compat03.py index 078d4dd3bce..fcbc7be2cda 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat03.py +++ b/src/third_party/wiredtiger/test/suite/test_compat03.py @@ -29,10 +29,9 @@ # test_compat03.py # Check compatibility API -import fnmatch, os +import os import wiredtiger, wttest from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, simple_key from wtscenario import make_scenarios class test_compat03(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_compat04.py b/src/third_party/wiredtiger/test/suite/test_compat04.py index 58176e05384..ea393f03ee9 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat04.py +++ b/src/third_party/wiredtiger/test/suite/test_compat04.py @@ -29,10 +29,8 @@ # test_compat04.py # Check compatibility API -import fnmatch, os -import wiredtiger, wttest +import wttest from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, simple_key from wtscenario import make_scenarios class test_compat04(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_compat05.py b/src/third_party/wiredtiger/test/suite/test_compat05.py index 820d707c6b0..ffa983c2058 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat05.py +++ b/src/third_party/wiredtiger/test/suite/test_compat05.py @@ -29,10 +29,10 @@ # test_compat05.py # Check log.archive compatibility API -import fnmatch, os, time -import wiredtiger, wttest +import os, time +import wttest from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, simple_key +from wtdataset import SimpleDataSet from wtscenario import make_scenarios class test_compat05(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_compress01.py b/src/third_party/wiredtiger/test/suite/test_compress01.py index f5a8a2d653c..e08772235b0 100644 --- a/src/third_party/wiredtiger/test/suite/test_compress01.py +++ b/src/third_party/wiredtiger/test/suite/test_compress01.py @@ -30,7 +30,7 @@ # Smoke-test compression # -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # Smoke-test compression diff --git a/src/third_party/wiredtiger/test/suite/test_compress02.py b/src/third_party/wiredtiger/test/suite/test_compress02.py index e2ce0dd3a33..5037dfd654e 100644 --- a/src/third_party/wiredtiger/test/suite/test_compress02.py +++ b/src/third_party/wiredtiger/test/suite/test_compress02.py @@ -26,13 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, threading, time -from wtthread import checkpoint_thread, op_thread from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet -from wtscenario import make_scenarios -from wiredtiger import stat # test_compress02.py # This test checks that the compression level can be reconfigured after restart if diff --git a/src/third_party/wiredtiger/test/suite/test_config01.py b/src/third_party/wiredtiger/test/suite/test_config01.py index fa68bf6d7f1..126d6de942f 100644 --- a/src/third_party/wiredtiger/test/suite/test_config01.py +++ b/src/third_party/wiredtiger/test/suite/test_config01.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, wtscenario, wttest +import wtscenario, wttest import test_base03 # test_config01.py diff --git a/src/third_party/wiredtiger/test/suite/test_config10.py b/src/third_party/wiredtiger/test/suite/test_config10.py index 6ae7860ffa3..1ecb9f53be3 100644 --- a/src/third_party/wiredtiger/test/suite/test_config10.py +++ b/src/third_party/wiredtiger/test/suite/test_config10.py @@ -31,7 +31,6 @@ # WiredTiger version file. import wiredtiger, wttest -from wiredtiger import stat import os class test_config10(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_cursor03.py b/src/third_party/wiredtiger/test/suite/test_cursor03.py index eea01312e5d..4a801bb5d42 100644 --- a/src/third_party/wiredtiger/test/suite/test_cursor03.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor03.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger from test_cursor_tracker import TestCursorTracker from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_cursor05.py b/src/third_party/wiredtiger/test/suite/test_cursor05.py index ebc95fb797f..851938b953c 100644 --- a/src/third_party/wiredtiger/test/suite/test_cursor05.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor05.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 +import wttest from wtscenario import make_scenarios # test_cursor05.py diff --git a/src/third_party/wiredtiger/test/suite/test_cursor07.py b/src/third_party/wiredtiger/test/suite/test_cursor07.py index 44f39fd3e42..58bc1b87223 100755 --- a/src/third_party/wiredtiger/test/suite/test_cursor07.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor07.py @@ -30,9 +30,7 @@ # Log cursors # -import fnmatch, os, shutil, run, time from suite_subprocess import suite_subprocess -from wiredtiger import stat from wtscenario import make_scenarios import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_cursor08.py b/src/third_party/wiredtiger/test/suite/test_cursor08.py index e48791c9abf..6b46038083e 100755 --- a/src/third_party/wiredtiger/test/suite/test_cursor08.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor08.py @@ -30,9 +30,7 @@ # Log cursors with compression # -import fnmatch, os, shutil, run, time from suite_subprocess import suite_subprocess -from wiredtiger import stat, WiredTigerError from wtscenario import make_scenarios import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_cursor10.py b/src/third_party/wiredtiger/test/suite/test_cursor10.py index 1b3cf5cc45d..4ccbccabbd3 100755 --- a/src/third_party/wiredtiger/test/suite/test_cursor10.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor10.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 +import wttest from wtscenario import make_scenarios # test_cursor10.py diff --git a/src/third_party/wiredtiger/test/suite/test_cursor12.py b/src/third_party/wiredtiger/test/suite/test_cursor12.py index c176e8a782c..6e3d418a4c5 100755 --- a/src/third_party/wiredtiger/test/suite/test_cursor12.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor12.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 random, string, sys +import random, string import wiredtiger, wttest from helper import copy_wiredtiger_home from wtdataset import SimpleDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_cursor13.py b/src/third_party/wiredtiger/test/suite/test_cursor13.py index b1abcca909e..b3e3a5175df 100755 --- a/src/third_party/wiredtiger/test/suite/test_cursor13.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor13.py @@ -31,7 +31,7 @@ from wiredtiger import stat from wtscenario import make_scenarios import test_cursor01, test_cursor02, test_cursor03 import test_checkpoint01, test_checkpoint02 -from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet +from wtdataset import SimpleDataSet, ComplexDataSet from helper import confirm_does_not_exist from suite_random import suite_random diff --git a/src/third_party/wiredtiger/test/suite/test_cursor14.py b/src/third_party/wiredtiger/test/suite/test_cursor14.py index ab746471da2..047b5d69892 100644 --- a/src/third_party/wiredtiger/test/suite/test_cursor14.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor14.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 +import wttest from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_cursor15.py b/src/third_party/wiredtiger/test/suite/test_cursor15.py index 1a950b7fc51..d6bd8032e57 100644 --- a/src/third_party/wiredtiger/test/suite/test_cursor15.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor15.py @@ -31,7 +31,6 @@ # import wttest -from wiredtiger import stat class test_cursor15(wttest.WiredTigerTestCase): tablename = 'test_read_once' diff --git a/src/third_party/wiredtiger/test/suite/test_cursor20.py b/src/third_party/wiredtiger/test/suite/test_cursor20.py index 3ff29695e7f..5f28eef5eac 100644 --- a/src/third_party/wiredtiger/test/suite/test_cursor20.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor20.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. # # test_cursor18.py -# Test dupicate key return values. +# Test duplicate key return values. from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_compare.py b/src/third_party/wiredtiger/test/suite/test_cursor_compare.py index 9c5d27d9eaa..fa34ce97e7c 100755 --- a/src/third_party/wiredtiger/test/suite/test_cursor_compare.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor_compare.py @@ -28,7 +28,7 @@ import wiredtiger, wttest from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet -from wtscenario import filter_scenarios, make_scenarios +from wtscenario import make_scenarios # Test cursor comparisons. class test_cursor_comparison(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_random02.py b/src/third_party/wiredtiger/test/suite/test_cursor_random02.py index 73f72927e4d..6a74f88f142 100644 --- a/src/third_party/wiredtiger/test/suite/test_cursor_random02.py +++ b/src/third_party/wiredtiger/test/suite/test_cursor_random02.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 +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_debug_info.py b/src/third_party/wiredtiger/test/suite/test_debug_info.py index 8abc74ee65c..94763168572 100644 --- a/src/third_party/wiredtiger/test/suite/test_debug_info.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_info.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 +import wttest # test_debug_info.py # Test WT_CONNECTION::debug_info undocumented feature @@ -42,7 +42,7 @@ class test_debug_info(wttest.WiredTigerTestCase): c[k] = 1 c.close() c = self.session.open_cursor(self.uri, None) - val = c[50] + c[50] self.conn.debug_info('cursors') c.close() diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode03.py b/src/third_party/wiredtiger/test/suite/test_debug_mode03.py index f0f377e3505..2851d94531c 100755 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode03.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode03.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 struct, wiredtiger, wttest +import struct, wttest def timestamp(kind, ts): return "{}_timestamp={:X}".format(kind, ts) diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode04.py b/src/third_party/wiredtiger/test/suite/test_debug_mode04.py index 29166914667..190973c46a1 100644 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode04.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode04.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 +import wttest # test_debug_mode04.py # Test the debug mode settings. Test eviction use. diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode05.py b/src/third_party/wiredtiger/test/suite/test_debug_mode05.py index aa548a83240..920bc3e2650 100644 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode05.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode05.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 +import wttest # test_debug_mode05.py # As per WT-5046, the debug table logging settings prevent rollback to diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode07.py b/src/third_party/wiredtiger/test/suite/test_debug_mode07.py index 6c1432937fe..bf6669e88d9 100644 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode07.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode07.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 wttest, wiredtiger +import wttest # test_debug_mode07.py # Test the debug mode settings. Test realloc_exact use (from WT-4919). diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode08.py b/src/third_party/wiredtiger/test/suite/test_debug_mode08.py index e4c9f121a0b..6b78d18b561 100755 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode08.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode08.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 wttest, wiredtiger, test_base03 +import wttest, test_base03 # test_debug_mode08.py # Test the debug mode setting for cursor_copy. diff --git a/src/third_party/wiredtiger/test/suite/test_dictionary.py b/src/third_party/wiredtiger/test/suite/test_dictionary.py index 9465827741c..77d20eb26a3 100644 --- a/src/third_party/wiredtiger/test/suite/test_dictionary.py +++ b/src/third_party/wiredtiger/test/suite/test_dictionary.py @@ -36,7 +36,7 @@ from wtscenario import make_scenarios from wtdataset import simple_key from wiredtiger import stat -import wiredtiger, wttest +import wttest # Smoke test dictionary compression. class test_dictionary(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_drop.py b/src/third_party/wiredtiger/test/suite/test_drop.py index 69da510adc8..e9f0aaea4ea 100644 --- a/src/third_party/wiredtiger/test/suite/test_drop.py +++ b/src/third_party/wiredtiger/test/suite/test_drop.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, time import wiredtiger, wttest from helper import confirm_does_not_exist from wtdataset import SimpleDataSet, ComplexDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_drop02.py b/src/third_party/wiredtiger/test/suite/test_drop02.py index 05a3a08a00c..8e0cfb08cdc 100644 --- a/src/third_party/wiredtiger/test/suite/test_drop02.py +++ b/src/third_party/wiredtiger/test/suite/test_drop02.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 +import wttest from wtdataset import SimpleDataSet # test_drop02.py diff --git a/src/third_party/wiredtiger/test/suite/test_drop_create.py b/src/third_party/wiredtiger/test/suite/test_drop_create.py index 38f44e6f9b9..6fc1f694b9d 100644 --- a/src/third_party/wiredtiger/test/suite/test_drop_create.py +++ b/src/third_party/wiredtiger/test/suite/test_drop_create.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 +import wttest # test_drop_create.py # Test dropping and creating diff --git a/src/third_party/wiredtiger/test/suite/test_dump.py b/src/third_party/wiredtiger/test/suite/test_dump.py index bc94d668f72..8b8e6ff3e10 100644 --- a/src/third_party/wiredtiger/test/suite/test_dump.py +++ b/src/third_party/wiredtiger/test/suite/test_dump.py @@ -31,7 +31,7 @@ # [END_TAGS] import os, shutil -import wiredtiger, wttest +import wttest from suite_subprocess import suite_subprocess from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_dump01.py b/src/third_party/wiredtiger/test/suite/test_dump01.py index cd6de8c7f62..8c7e5112598 100644 --- a/src/third_party/wiredtiger/test/suite/test_dump01.py +++ b/src/third_party/wiredtiger/test/suite/test_dump01.py @@ -30,8 +30,7 @@ # wt_util # [END_TAGS] -import os, shutil -import wiredtiger, wttest +import wttest from suite_subprocess import suite_subprocess diff --git a/src/third_party/wiredtiger/test/suite/test_dupc.py b/src/third_party/wiredtiger/test/suite/test_dupc.py index 4088f531619..890af88c63c 100644 --- a/src/third_party/wiredtiger/test/suite/test_dupc.py +++ b/src/third_party/wiredtiger/test/suite/test_dupc.py @@ -30,7 +30,6 @@ # test cursor duplication # -import os, time import wiredtiger, wttest from wtdataset import SimpleDataSet, ComplexDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_durability01.py b/src/third_party/wiredtiger/test/suite/test_durability01.py index f6b3d1ff4f5..c2210576eae 100644 --- a/src/third_party/wiredtiger/test/suite/test_durability01.py +++ b/src/third_party/wiredtiger/test/suite/test_durability01.py @@ -31,7 +31,6 @@ # cause files to be closed. # -import fnmatch, os, shutil, time from helper import copy_wiredtiger_home from suite_subprocess import suite_subprocess import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py b/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py index db00d289f80..e34f1843c3e 100644 --- a/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_durable_ts01.py b/src/third_party/wiredtiger/test/suite/test_durable_ts01.py index 29284165d94..4864ebc1d8d 100644 --- a/src/third_party/wiredtiger/test/suite/test_durable_ts01.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_ts01.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_durable_ts02.py b/src/third_party/wiredtiger/test/suite/test_durable_ts02.py index 2411e3c08a8..e263a0304e2 100644 --- a/src/third_party/wiredtiger/test/suite/test_durable_ts02.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_ts02.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_durable_ts03.py b/src/third_party/wiredtiger/test/suite/test_durable_ts03.py index 435688b27bf..44fb78f5fd9 100755 --- a/src/third_party/wiredtiger/test/suite/test_durable_ts03.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_ts03.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_durable_ts03.py diff --git a/src/third_party/wiredtiger/test/suite/test_empty.py b/src/third_party/wiredtiger/test/suite/test_empty.py index af738bfb723..cbca975afe7 100755 --- a/src/third_party/wiredtiger/test/suite/test_empty.py +++ b/src/third_party/wiredtiger/test/suite/test_empty.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import os -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_empty.py diff --git a/src/third_party/wiredtiger/test/suite/test_empty_value.py b/src/third_party/wiredtiger/test/suite/test_empty_value.py index fb72ba31676..9f80b915764 100644 --- a/src/third_party/wiredtiger/test/suite/test_empty_value.py +++ b/src/third_party/wiredtiger/test/suite/test_empty_value.py @@ -30,7 +30,7 @@ # Smoke test empty row-store values. from wiredtiger import stat -import wiredtiger, wttest, unittest +import wttest # Smoke test empty row-store values. class test_row_store_empty_values(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt01.py b/src/third_party/wiredtiger/test/suite/test_encrypt01.py index 94acd8aa433..c4b0dd9ac36 100644 --- a/src/third_party/wiredtiger/test/suite/test_encrypt01.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt01.py @@ -30,8 +30,8 @@ # Basic block encryption operations # -import os, run, random -import wiredtiger, wttest +import random +import wttest from wtscenario import make_scenarios # Test basic encryption diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt02.py b/src/third_party/wiredtiger/test/suite/test_encrypt02.py index c678a5a21e6..6beba93ef65 100644 --- a/src/third_party/wiredtiger/test/suite/test_encrypt02.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt02.py @@ -34,8 +34,8 @@ # Encryption using passwords # -import os, run, random -import wiredtiger, wttest +import random +import wttest from suite_subprocess import suite_subprocess from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt03.py b/src/third_party/wiredtiger/test/suite/test_encrypt03.py index 5ae72e2d94f..4949b3eb2e5 100644 --- a/src/third_party/wiredtiger/test/suite/test_encrypt03.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt03.py @@ -30,7 +30,6 @@ # Test some error conditions with encryption. # -import os, run, random import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt04.py b/src/third_party/wiredtiger/test/suite/test_encrypt04.py index e9b28a791cb..18ca4448ce3 100644 --- a/src/third_party/wiredtiger/test/suite/test_encrypt04.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt04.py @@ -30,8 +30,8 @@ # Test mismatches error conditions with encryption. # -import os, run, random -import wiredtiger, wttest +import random +import wttest from wtscenario import make_scenarios from suite_subprocess import suite_subprocess diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt06.py b/src/third_party/wiredtiger/test/suite/test_encrypt06.py index be428f5a3cf..b7d42501ff9 100755 --- a/src/third_party/wiredtiger/test/suite/test_encrypt06.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt06.py @@ -30,8 +30,8 @@ # Test that encryption is effective, it leaves no clear text # -import os, run, random -import wiredtiger, wttest +import os +import wttest from wtscenario import make_scenarios # Test encryption, when on, does not leak any information diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt07.py b/src/third_party/wiredtiger/test/suite/test_encrypt07.py index d4ca530eead..7e1966fcb2b 100755 --- a/src/third_party/wiredtiger/test/suite/test_encrypt07.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt07.py @@ -30,8 +30,8 @@ # Salvage encrypted databases # -import os, run, string, codecs -import wiredtiger, wttest +import codecs +import wttest # If removing this, update test_salvage to not reference here. import test_salvage diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt08.py b/src/third_party/wiredtiger/test/suite/test_encrypt08.py index 5e4e065d3f3..a33556dfd1e 100644 --- a/src/third_party/wiredtiger/test/suite/test_encrypt08.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt08.py @@ -30,7 +30,6 @@ # Test some error conditions with the libsodium encryption extension. # -import os, run, random import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt09.py b/src/third_party/wiredtiger/test/suite/test_encrypt09.py index 4232ab96a5f..5a5cda95695 100644 --- a/src/third_party/wiredtiger/test/suite/test_encrypt09.py +++ b/src/third_party/wiredtiger/test/suite/test_encrypt09.py @@ -30,7 +30,6 @@ # Test some error conditions with the libsodium encryption extension. # -import os, run, random import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_flcs01.py b/src/third_party/wiredtiger/test/suite/test_flcs01.py index d420b75638b..4e5f90989b6 100644 --- a/src/third_party/wiredtiger/test/suite/test_flcs01.py +++ b/src/third_party/wiredtiger/test/suite/test_flcs01.py @@ -28,7 +28,6 @@ import wiredtiger, wttest from wtdataset import SimpleDataSet -from wtscenario import make_scenarios # test_flcs01.py # diff --git a/src/third_party/wiredtiger/test/suite/test_gc01.py b/src/third_party/wiredtiger/test/suite/test_gc01.py index 6053cbba384..e25847e3f48 100755 --- a/src/third_party/wiredtiger/test/suite/test_gc01.py +++ b/src/third_party/wiredtiger/test/suite/test_gc01.py @@ -30,8 +30,6 @@ # checkpoint:garbage_collection # [END_TAGS] -import time -from helper import copy_wiredtiger_home import wiredtiger, wttest from wtdataset import SimpleDataSet from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_hazard.py b/src/third_party/wiredtiger/test/suite/test_hazard.py index 75d270de0ed..2ea4edbbb78 100644 --- a/src/third_party/wiredtiger/test/suite/test_hazard.py +++ b/src/third_party/wiredtiger/test/suite/test_hazard.py @@ -29,7 +29,7 @@ # test_hazard.py # Hazard pointer tests. -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet # Regression tests. diff --git a/src/third_party/wiredtiger/test/suite/test_home.py b/src/third_party/wiredtiger/test/suite/test_home.py index 4d8868a904e..9bf0a37e0d1 100644 --- a/src/third_party/wiredtiger/test/suite/test_home.py +++ b/src/third_party/wiredtiger/test/suite/test_home.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import os -import wiredtiger, wttest +import wttest # test_isnew # database is-new method diff --git a/src/third_party/wiredtiger/test/suite/test_hs02.py b/src/third_party/wiredtiger/test/suite/test_hs02.py index 3f5477c7f82..1575d2ab1b5 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs02.py +++ b/src/third_party/wiredtiger/test/suite/test_hs02.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs03.py b/src/third_party/wiredtiger/test/suite/test_hs03.py index 2a267bc6825..c157964f163 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs03.py +++ b/src/third_party/wiredtiger/test/suite/test_hs03.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wiredtiger import stat from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs07.py b/src/third_party/wiredtiger/test/suite/test_hs07.py index 10fc559bad4..29bb930a657 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs07.py +++ b/src/third_party/wiredtiger/test/suite/test_hs07.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. import time -from helper import copy_wiredtiger_home import wiredtiger, wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs08.py b/src/third_party/wiredtiger/test/suite/test_hs08.py index 05505663c32..66e3d3dadde 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs08.py +++ b/src/third_party/wiredtiger/test/suite/test_hs08.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, time +import wiredtiger, wttest from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs09.py b/src/third_party/wiredtiger/test/suite/test_hs09.py index c00a93e48ac..6175fbbfed9 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs09.py +++ b/src/third_party/wiredtiger/test/suite/test_hs09.py @@ -30,8 +30,7 @@ # history_store # [END_TAGS] -import wiredtiger, wttest -from wiredtiger import stat +import wttest from wtscenario import make_scenarios # test_hs09.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs10.py b/src/third_party/wiredtiger/test/suite/test_hs10.py index e4607671da2..be17c6cd11d 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs10.py +++ b/src/third_party/wiredtiger/test/suite/test_hs10.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest, time -from wiredtiger import stat +import wiredtiger, wttest from wtscenario import make_scenarios # test_hs10.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs12.py b/src/third_party/wiredtiger/test/suite/test_hs12.py index 5490ad1acdb..fcd89b6dff2 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs12.py +++ b/src/third_party/wiredtiger/test/suite/test_hs12.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, time +import wiredtiger, wttest from wtscenario import make_scenarios # test_hs12.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs15.py b/src/third_party/wiredtiger/test/suite/test_hs15.py index 4326d9f7cc7..b1ca3536d73 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs15.py +++ b/src/third_party/wiredtiger/test/suite/test_hs15.py @@ -31,7 +31,7 @@ # [END_TAGS] # -import time, wiredtiger, wttest +import wiredtiger, wttest from wtscenario import make_scenarios # test_hs15.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs16.py b/src/third_party/wiredtiger/test/suite/test_hs16.py index 253495cd6e7..edfa207a57d 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs16.py +++ b/src/third_party/wiredtiger/test/suite/test_hs16.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 time, wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_hs16.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs18.py b/src/third_party/wiredtiger/test/suite/test_hs18.py index e85d71dd898..1600431a974 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs18.py +++ b/src/third_party/wiredtiger/test/suite/test_hs18.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 time, wiredtiger, wttest, unittest +import wiredtiger, wttest from wtscenario import make_scenarios # test_hs18.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs19.py b/src/third_party/wiredtiger/test/suite/test_hs19.py index bf648a0f4e8..89148b232db 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs19.py +++ b/src/third_party/wiredtiger/test/suite/test_hs19.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 time, wiredtiger, wttest +import wiredtiger, wttest from wtscenario import make_scenarios # test_hs19.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs20.py b/src/third_party/wiredtiger/test/suite/test_hs20.py index babca59fc9a..6867a7ea7c8 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs20.py +++ b/src/third_party/wiredtiger/test/suite/test_hs20.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 time, wiredtiger, wttest +import wiredtiger, wttest from wtscenario import make_scenarios # test_hs20.py diff --git a/src/third_party/wiredtiger/test/suite/test_hs21.py b/src/third_party/wiredtiger/test/suite/test_hs21.py index 7630b4fcc28..6f1c384c868 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs21.py +++ b/src/third_party/wiredtiger/test/suite/test_hs21.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import time, re -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs22.py b/src/third_party/wiredtiger/test/suite/test_hs22.py index aca5414a560..789b0c40d99 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs22.py +++ b/src/third_party/wiredtiger/test/suite/test_hs22.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 +import wttest from wtscenario import make_scenarios ''' diff --git a/src/third_party/wiredtiger/test/suite/test_hs26.py b/src/third_party/wiredtiger/test/suite/test_hs26.py index c849f9fd397..91091db0ebb 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs26.py +++ b/src/third_party/wiredtiger/test/suite/test_hs26.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 +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs27.py b/src/third_party/wiredtiger/test/suite/test_hs27.py index 42642b31337..dd5772e0aa5 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs27.py +++ b/src/third_party/wiredtiger/test/suite/test_hs27.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 +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py b/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py index 64dc5ae8c7f..adce36d1f74 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py +++ b/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. from time import sleep -import wttest, threading, wiredtiger +import wttest, threading from helper import simulate_crash_restart from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_huffman01.py b/src/third_party/wiredtiger/test/suite/test_huffman01.py index 418448390f0..8daacfc50a5 100644 --- a/src/third_party/wiredtiger/test/suite/test_huffman01.py +++ b/src/third_party/wiredtiger/test/suite/test_huffman01.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os from suite_subprocess import suite_subprocess from wtscenario import make_scenarios import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_huffman02.py b/src/third_party/wiredtiger/test/suite/test_huffman02.py index 91bbbbc37bd..d67d8f57e6b 100644 --- a/src/third_party/wiredtiger/test/suite/test_huffman02.py +++ b/src/third_party/wiredtiger/test/suite/test_huffman02.py @@ -30,7 +30,6 @@ # huffman_encoding # [END_TAGS] -import os from suite_subprocess import suite_subprocess from wtscenario import make_scenarios import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_import01.py b/src/third_party/wiredtiger/test/suite/test_import01.py index bf470a2bf52..24ab7f22c2d 100644 --- a/src/third_party/wiredtiger/test/suite/test_import01.py +++ b/src/third_party/wiredtiger/test/suite/test_import01.py @@ -32,7 +32,7 @@ # - The source database and destination database are the same. import os, random, re, shutil, string -import wiredtiger, wttest +import wttest # Shared base class used by import tests. class test_import_base(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_import02.py b/src/third_party/wiredtiger/test/suite/test_import02.py index 402dec3c206..b22f3b9e6fc 100644 --- a/src/third_party/wiredtiger/test/suite/test_import02.py +++ b/src/third_party/wiredtiger/test/suite/test_import02.py @@ -30,7 +30,7 @@ # Error conditions when trying to import files. import os, shutil -import wiredtiger, wttest +import wiredtiger from test_import01 import test_import_base class test_import02(test_import_base): diff --git a/src/third_party/wiredtiger/test/suite/test_inmem02.py b/src/third_party/wiredtiger/test/suite/test_inmem02.py index 25acdb8987c..b8610d2a166 100755 --- a/src/third_party/wiredtiger/test/suite/test_inmem02.py +++ b/src/third_party/wiredtiger/test/suite/test_inmem02.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -from time import sleep from wtdataset import SimpleDataSet # test_inmem02.py diff --git a/src/third_party/wiredtiger/test/suite/test_intpack.py b/src/third_party/wiredtiger/test/suite/test_intpack.py index 4cb33befde4..5b98c7fce5d 100644 --- a/src/third_party/wiredtiger/test/suite/test_intpack.py +++ b/src/third_party/wiredtiger/test/suite/test_intpack.py @@ -30,7 +30,7 @@ # Tests integer packing using public methods # -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class PackTester: diff --git a/src/third_party/wiredtiger/test/suite/test_join01.py b/src/third_party/wiredtiger/test/suite/test_join01.py index c1e763f1382..cabb8a23f1a 100644 --- a/src/third_party/wiredtiger/test/suite/test_join01.py +++ b/src/third_party/wiredtiger/test/suite/test_join01.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 +import wttest from wtscenario import make_scenarios # test_join01.py diff --git a/src/third_party/wiredtiger/test/suite/test_join02.py b/src/third_party/wiredtiger/test/suite/test_join02.py index 4492af3ee31..f9b93699973 100755 --- a/src/third_party/wiredtiger/test/suite/test_join02.py +++ b/src/third_party/wiredtiger/test/suite/test_join02.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, suite_random +import wttest, suite_random from wtscenario import make_scenarios # test_join02.py diff --git a/src/third_party/wiredtiger/test/suite/test_join03.py b/src/third_party/wiredtiger/test/suite/test_join03.py index 4d328af32ae..9d96306c39a 100644 --- a/src/third_party/wiredtiger/test/suite/test_join03.py +++ b/src/third_party/wiredtiger/test/suite/test_join03.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wttest # test_join03.py # Join operations diff --git a/src/third_party/wiredtiger/test/suite/test_join04.py b/src/third_party/wiredtiger/test/suite/test_join04.py index 4af3564329f..635f8c0e5ae 100644 --- a/src/third_party/wiredtiger/test/suite/test_join04.py +++ b/src/third_party/wiredtiger/test/suite/test_join04.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wttest # test_join04.py # Join operations diff --git a/src/third_party/wiredtiger/test/suite/test_join05.py b/src/third_party/wiredtiger/test/suite/test_join05.py index b0a8a492ce2..87d15105b25 100644 --- a/src/third_party/wiredtiger/test/suite/test_join05.py +++ b/src/third_party/wiredtiger/test/suite/test_join05.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 +import wttest # test_join05.py # Tests based on JIRA reports diff --git a/src/third_party/wiredtiger/test/suite/test_join06.py b/src/third_party/wiredtiger/test/suite/test_join06.py index bd5a6311d24..811079ecfd8 100644 --- a/src/third_party/wiredtiger/test/suite/test_join06.py +++ b/src/third_party/wiredtiger/test/suite/test_join06.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wiredtiger, wttest from wtscenario import make_scenarios # test_join06.py diff --git a/src/third_party/wiredtiger/test/suite/test_join07.py b/src/third_party/wiredtiger/test/suite/test_join07.py index cd484d403cb..5eff0250d26 100644 --- a/src/third_party/wiredtiger/test/suite/test_join07.py +++ b/src/third_party/wiredtiger/test/suite/test_join07.py @@ -26,8 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, re, run -import wiredtiger, wttest, suite_random +import re +import wttest from wtscenario import make_scenarios class ParseException(Exception): diff --git a/src/third_party/wiredtiger/test/suite/test_join09.py b/src/third_party/wiredtiger/test/suite/test_join09.py index 64ea0b8a3b7..9405acba1d7 100644 --- a/src/third_party/wiredtiger/test/suite/test_join09.py +++ b/src/third_party/wiredtiger/test/suite/test_join09.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wttest from wtscenario import make_scenarios # test_join09.py diff --git a/src/third_party/wiredtiger/test/suite/test_join10.py b/src/third_party/wiredtiger/test/suite/test_join10.py index 9417efe8121..b38b8423dbb 100755 --- a/src/third_party/wiredtiger/test/suite/test_join10.py +++ b/src/third_party/wiredtiger/test/suite/test_join10.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest -from wtscenario import make_scenarios +import wttest # test_join10.py # Test modeled on the C example for join. diff --git a/src/third_party/wiredtiger/test/suite/test_jsondump01.py b/src/third_party/wiredtiger/test/suite/test_jsondump01.py index bc1487bfdee..1f540dfb039 100755 --- a/src/third_party/wiredtiger/test/suite/test_jsondump01.py +++ b/src/third_party/wiredtiger/test/suite/test_jsondump01.py @@ -26,8 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, json -import wiredtiger, wttest +import json +import wttest from wtdataset import SimpleDataSet, SimpleLSMDataSet, SimpleIndexDataSet, \ ComplexDataSet, ComplexLSMDataSet from helper import compare_files diff --git a/src/third_party/wiredtiger/test/suite/test_jsondump02.py b/src/third_party/wiredtiger/test/suite/test_jsondump02.py index e7cbe53292d..7735238c6c5 100755 --- a/src/third_party/wiredtiger/test/suite/test_jsondump02.py +++ b/src/third_party/wiredtiger/test/suite/test_jsondump02.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, sys import wiredtiger, wttest from suite_subprocess import suite_subprocess diff --git a/src/third_party/wiredtiger/test/suite/test_log03.py b/src/third_party/wiredtiger/test/suite/test_log03.py index 6f2fb05e03e..c8f4cd6ce56 100755 --- a/src/third_party/wiredtiger/test/suite/test_log03.py +++ b/src/third_party/wiredtiger/test/suite/test_log03.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import os, shutil -import helper, wiredtiger, wttest +import wttest from wiredtiger import stat # test_log03.py diff --git a/src/third_party/wiredtiger/test/suite/test_lsm01.py b/src/third_party/wiredtiger/test/suite/test_lsm01.py index 0c154cd3d57..9786976cf36 100644 --- a/src/third_party/wiredtiger/test/suite/test_lsm01.py +++ b/src/third_party/wiredtiger/test/suite/test_lsm01.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, wtscenario, wttest +import wtscenario, wttest from wtdataset import SimpleDataSet # test_lsm01.py diff --git a/src/third_party/wiredtiger/test/suite/test_lsm02.py b/src/third_party/wiredtiger/test/suite/test_lsm02.py index 3c0c47c31e3..deaa94e3038 100755 --- a/src/third_party/wiredtiger/test/suite/test_lsm02.py +++ b/src/third_party/wiredtiger/test/suite/test_lsm02.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, wtscenario, wttest +import wttest # test_lsm02.py # Test LSM schema level operations diff --git a/src/third_party/wiredtiger/test/suite/test_lsm03.py b/src/third_party/wiredtiger/test/suite/test_lsm03.py index fda06eba95f..6994b557da7 100644 --- a/src/third_party/wiredtiger/test/suite/test_lsm03.py +++ b/src/third_party/wiredtiger/test/suite/test_lsm03.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, wtscenario, wttest +import wiredtiger, wttest from wtdataset import SimpleDataSet # test_lsm03.py diff --git a/src/third_party/wiredtiger/test/suite/test_metadata_cursor02.py b/src/third_party/wiredtiger/test/suite/test_metadata_cursor02.py index bcd34342838..c23d0b9888e 100644 --- a/src/third_party/wiredtiger/test/suite/test_metadata_cursor02.py +++ b/src/third_party/wiredtiger/test/suite/test_metadata_cursor02.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 +import wttest from wtscenario import make_scenarios # test_metadata_cursor02.py diff --git a/src/third_party/wiredtiger/test/suite/test_metadata_cursor03.py b/src/third_party/wiredtiger/test/suite/test_metadata_cursor03.py index 4a7bf105448..836893d0e91 100644 --- a/src/third_party/wiredtiger/test/suite/test_metadata_cursor03.py +++ b/src/third_party/wiredtiger/test/suite/test_metadata_cursor03.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 sys, wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_metadata03.py diff --git a/src/third_party/wiredtiger/test/suite/test_metadata_cursor04.py b/src/third_party/wiredtiger/test/suite/test_metadata_cursor04.py index fe6c10415af..359506f16ad 100644 --- a/src/third_party/wiredtiger/test/suite/test_metadata_cursor04.py +++ b/src/third_party/wiredtiger/test/suite/test_metadata_cursor04.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 +import wttest # test_metadata04.py # Check metadata create cursors with complex tables. diff --git a/src/third_party/wiredtiger/test/suite/test_pack.py b/src/third_party/wiredtiger/test/suite/test_pack.py index cc0053e019a..5a6e13cf816 100755 --- a/src/third_party/wiredtiger/test/suite/test_pack.py +++ b/src/third_party/wiredtiger/test/suite/test_pack.py @@ -30,8 +30,8 @@ # Tests packing using public methods # -import wiredtiger, wttest -import re, sys +import wttest +import re class test_pack(wttest.WiredTigerTestCase): name = 'test_pack' diff --git a/src/third_party/wiredtiger/test/suite/test_prepare01.py b/src/third_party/wiredtiger/test/suite/test_prepare01.py index 998a6ac3c62..5a4986d4881 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare01.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare01.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 +import wttest from wtscenario import make_scenarios # test_prepare01.py diff --git a/src/third_party/wiredtiger/test/suite/test_prepare07.py b/src/third_party/wiredtiger/test/suite/test_prepare07.py index d167ef868d2..b0ed6768017 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare07.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare07.py @@ -26,9 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, time -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import os +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_prepare08.py b/src/third_party/wiredtiger/test/suite/test_prepare08.py index c0df31d1bca..2207e2b8001 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare08.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare08.py @@ -26,8 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, time -from helper import copy_wiredtiger_home import wiredtiger, wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_prepare10.py b/src/third_party/wiredtiger/test/suite/test_prepare10.py index a4acf46c73c..dc25ff310da 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare10.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare10.py @@ -26,8 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, time -from helper import copy_wiredtiger_home import wiredtiger, wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_prepare11.py b/src/third_party/wiredtiger/test/suite/test_prepare11.py index 72fd7ebef2c..40ea3fa3c38 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare11.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare11.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 +import wttest from wtscenario import make_scenarios # test_prepare11.py diff --git a/src/third_party/wiredtiger/test/suite/test_prepare12.py b/src/third_party/wiredtiger/test/suite/test_prepare12.py index 09f00ac288b..1a3dab73cc6 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare12.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare12.py @@ -30,7 +30,7 @@ # eviction:prepare # [END_TAGS] -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_prepare12.py diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_cursor01.py b/src/third_party/wiredtiger/test/suite/test_prepare_cursor01.py index 07192fa9888..e748bc1c467 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_cursor01.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_cursor01.py @@ -31,8 +31,7 @@ # [END_TAGS] import wiredtiger, wttest -from wtdataset import SimpleDataSet, SimpleIndexDataSet -from wtdataset import SimpleLSMDataSet, ComplexDataSet, ComplexLSMDataSet +from wtdataset import SimpleDataSet from wtscenario import make_scenarios # test_prepare_cursor01.py diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py b/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py index 6fb41a1d8b6..aff5df7f2fa 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py @@ -27,8 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import wiredtiger, wttest -from wtdataset import SimpleDataSet, SimpleIndexDataSet -from wtdataset import SimpleLSMDataSet, ComplexDataSet, ComplexLSMDataSet +from wtdataset import SimpleDataSet from wtscenario import make_scenarios # test_prepare_cursor02.py diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py index f55fe7ba9db..024cedaf474 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py index 39fb0c576e5..d09cd4ee96b 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py @@ -30,10 +30,9 @@ # Prepare updates can be resolved for both commit // rollback operations. # -from helper import copy_wiredtiger_home import random from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py index bdf4234aaca..11c7aec3bdf 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py @@ -32,9 +32,9 @@ # [END_TAGS] from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet -import os, shutil +import os from wtscenario import make_scenarios from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py index 98a363540cd..ce540e74611 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py @@ -26,9 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios -from wiredtiger import stat, WT_NOTFOUND +from wiredtiger import WT_NOTFOUND # test_prepare_hs05.py # Test that after aborting prepare transaction, correct update from the history store is restored. diff --git a/src/third_party/wiredtiger/test/suite/test_readonly01.py b/src/third_party/wiredtiger/test/suite/test_readonly01.py index c4743f05237..701512c789c 100755 --- a/src/third_party/wiredtiger/test/suite/test_readonly01.py +++ b/src/third_party/wiredtiger/test/suite/test_readonly01.py @@ -30,7 +30,7 @@ # Readonly: Test readonly mode. # -import fnmatch, os, shutil, time +import os from suite_subprocess import suite_subprocess from wtscenario import make_scenarios import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_readonly03.py b/src/third_party/wiredtiger/test/suite/test_readonly03.py index 072fca96565..c058e83942b 100644 --- a/src/third_party/wiredtiger/test/suite/test_readonly03.py +++ b/src/third_party/wiredtiger/test/suite/test_readonly03.py @@ -31,7 +31,7 @@ # all return ENOTSUP. # -import os, sys, wiredtiger, wttest +import wiredtiger, wttest from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_reconfig03.py b/src/third_party/wiredtiger/test/suite/test_reconfig03.py index afde7894ea2..55901b6ecc1 100644 --- a/src/third_party/wiredtiger/test/suite/test_reconfig03.py +++ b/src/third_party/wiredtiger/test/suite/test_reconfig03.py @@ -26,8 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, time -import wiredtiger, wttest +import time +import wttest from wtdataset import SimpleDataSet # test_reconfig03.py diff --git a/src/third_party/wiredtiger/test/suite/test_reconfig04.py b/src/third_party/wiredtiger/test/suite/test_reconfig04.py index 82dca85725c..44e84569c00 100644 --- a/src/third_party/wiredtiger/test/suite/test_reconfig04.py +++ b/src/third_party/wiredtiger/test/suite/test_reconfig04.py @@ -30,7 +30,7 @@ # session_api:reconfigure # [END_TAGS] -import wiredtiger, wttest +import wttest # test_reconfig04.py # Test WT_SESSION::reconfigure diff --git a/src/third_party/wiredtiger/test/suite/test_rename.py b/src/third_party/wiredtiger/test/suite/test_rename.py index 17f05015a7a..3ec8ef3bdbc 100644 --- a/src/third_party/wiredtiger/test/suite/test_rename.py +++ b/src/third_party/wiredtiger/test/suite/test_rename.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, time import wiredtiger, wttest from helper import confirm_does_not_exist from wtdataset import SimpleDataSet, ComplexDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py index fc2a589e142..c44a69a5860 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py @@ -26,8 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import time -from helper import copy_wiredtiger_home import wiredtiger, wttest from wtdataset import SimpleDataSet from wiredtiger import stat, wiredtiger_strerror, WiredTigerError, WT_ROLLBACK diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py index 47ad3ac3f00..8d0c9e66d05 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py @@ -26,9 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import time -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py index 2adbf8a0d19..e3bda2548d8 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py @@ -26,9 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import time -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py index 42f2c9ed919..d21b17c1dda 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py @@ -26,9 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import time -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py index 19cdba56446..547867e569a 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, time from helper import simulate_crash_restart from test_rollback_to_stable01 import test_rollback_to_stable_base from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py index 9f5ced5ccfc..d797519a5c4 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py @@ -28,7 +28,6 @@ import os import wiredtiger -from wtdataset import SimpleDataSet from wtscenario import make_scenarios from test_rollback_to_stable01 import test_rollback_to_stable_base diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py index ed1a8e50285..beacb3c6f75 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, time from helper import simulate_crash_restart from test_rollback_to_stable01 import test_rollback_to_stable_base from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py index dc25343a558..c54ae01e9f1 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, time from helper import simulate_crash_restart from test_rollback_to_stable01 import test_rollback_to_stable_base from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py index 466d6154e11..edc5ac31aba 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py @@ -26,10 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -from helper import copy_wiredtiger_home -import wiredtiger, wttest, unittest +import wttest from wiredtiger import stat -from wtdataset import SimpleDataSet from wtscenario import make_scenarios # test_rollback_to_stable15.py diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py index 7a797683efc..6c81785c0c9 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py @@ -30,11 +30,9 @@ # rollback_to_stable # [END_TAGS] -import os, shutil from helper import simulate_crash_restart import wiredtiger, wttest from wiredtiger import stat -from wtdataset import SimpleDataSet from wtscenario import make_scenarios # test_rollback_to_stable16.py diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py index 6139783890e..d7e8211e5ce 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py @@ -26,11 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, shutil from helper import simulate_crash_restart -import wiredtiger, wttest +import wttest from wiredtiger import stat -from wtdataset import SimpleDataSet from wtscenario import make_scenarios # test_rollback_to_stable17.py diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py index 045c6f698af..ab64bd76684 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py @@ -26,9 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import time -from helper import copy_wiredtiger_home -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py index da9a7c72b1c..ad3b85ba893 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.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 +import wttest from wtscenario import make_scenarios # test_rollback_to_stable24.py diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py index a7f5a98b1b1..6be6628ecec 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py @@ -29,7 +29,7 @@ import threading, time from helper import simulate_crash_restart from test_rollback_to_stable01 import test_rollback_to_stable_base -from wiredtiger import stat, WT_NOTFOUND +from wiredtiger import stat from wtdataset import SimpleDataSet from wtscenario import make_scenarios from wtthread import checkpoint_thread diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py index d8b7622e5be..9a3ba74c672 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. from test_rollback_to_stable01 import test_rollback_to_stable_base -from wiredtiger import stat, Modify, WT_NOTFOUND from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py index 161cbd31daa..37719c7b67e 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py @@ -26,13 +26,10 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, threading, time -from wtthread import checkpoint_thread -import wiredtiger from wiredtiger import stat from wtdataset import SimpleDataSet from wtscenario import make_scenarios -from helper import copy_wiredtiger_home, simulate_crash_restart +from helper import simulate_crash_restart from test_rollback_to_stable01 import test_rollback_to_stable_base # test_rollback_to_stable29.py diff --git a/src/third_party/wiredtiger/test/suite/test_salvage.py b/src/third_party/wiredtiger/test/suite/test_salvage.py index 3cfc7ff7360..49f8462362f 100755 --- a/src/third_party/wiredtiger/test/suite/test_salvage.py +++ b/src/third_party/wiredtiger/test/suite/test_salvage.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, struct +import os from suite_subprocess import suite_subprocess import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_schema01.py b/src/third_party/wiredtiger/test/suite/test_schema01.py index 45617c9039e..d4b8f9f5799 100644 --- a/src/third_party/wiredtiger/test/suite/test_schema01.py +++ b/src/third_party/wiredtiger/test/suite/test_schema01.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 +import wttest pop_data = [ ( 'USA', 1980, 226542250 ), diff --git a/src/third_party/wiredtiger/test/suite/test_schema03.py b/src/third_party/wiredtiger/test/suite/test_schema03.py index 1ab11a64f82..f8c4c5144ef 100755 --- a/src/third_party/wiredtiger/test/suite/test_schema03.py +++ b/src/third_party/wiredtiger/test/suite/test_schema03.py @@ -33,8 +33,7 @@ import os import suite_random -import wiredtiger, wtscenario, wttest -from wtscenario import make_scenarios +import wtscenario, wttest try: # Windows does not getrlimit/setrlimit so we must catch the resource diff --git a/src/third_party/wiredtiger/test/suite/test_schema04.py b/src/third_party/wiredtiger/test/suite/test_schema04.py index 3d4b4ae865d..76a5c4b6980 100644 --- a/src/third_party/wiredtiger/test/suite/test_schema04.py +++ b/src/third_party/wiredtiger/test/suite/test_schema04.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wttest from wtscenario import make_scenarios # test_schema04.py diff --git a/src/third_party/wiredtiger/test/suite/test_schema05.py b/src/third_party/wiredtiger/test/suite/test_schema05.py index b3c33ac512f..c99f65dad4a 100644 --- a/src/third_party/wiredtiger/test/suite/test_schema05.py +++ b/src/third_party/wiredtiger/test/suite/test_schema05.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os -import wiredtiger, wttest, run +import wttest from wtscenario import make_scenarios # test_schema05.py diff --git a/src/third_party/wiredtiger/test/suite/test_schema06.py b/src/third_party/wiredtiger/test/suite/test_schema06.py index f6379f3ebcb..f23d6de834f 100644 --- a/src/third_party/wiredtiger/test/suite/test_schema06.py +++ b/src/third_party/wiredtiger/test/suite/test_schema06.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 +import wttest from wtscenario import make_scenarios # test_schema06.py diff --git a/src/third_party/wiredtiger/test/suite/test_schema07.py b/src/third_party/wiredtiger/test/suite/test_schema07.py index f3c952cd9c3..386552bb6aa 100644 --- a/src/third_party/wiredtiger/test/suite/test_schema07.py +++ b/src/third_party/wiredtiger/test/suite/test_schema07.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 +import wttest # test_schema07.py # Test that long-running tests don't fill the cache with metadata diff --git a/src/third_party/wiredtiger/test/suite/test_schema08.py b/src/third_party/wiredtiger/test/suite/test_schema08.py index 7d5fb152e2d..78d4ee956f3 100644 --- a/src/third_party/wiredtiger/test/suite/test_schema08.py +++ b/src/third_party/wiredtiger/test/suite/test_schema08.py @@ -26,9 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import fnmatch, os, shutil, sys +import os, shutil from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_schema08.py diff --git a/src/third_party/wiredtiger/test/suite/test_search_near01.py b/src/third_party/wiredtiger/test/suite/test_search_near01.py index c9a466063ff..f13d35dd5ef 100755 --- a/src/third_party/wiredtiger/test/suite/test_search_near01.py +++ b/src/third_party/wiredtiger/test/suite/test_search_near01.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. # -import time, wiredtiger, wttest, unittest +import wiredtiger, wttest from wiredtiger import stat # test_search_near01.py diff --git a/src/third_party/wiredtiger/test/suite/test_search_near02.py b/src/third_party/wiredtiger/test/suite/test_search_near02.py index 0f981f84af4..416577b559c 100644 --- a/src/third_party/wiredtiger/test/suite/test_search_near02.py +++ b/src/third_party/wiredtiger/test/suite/test_search_near02.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. # -import wiredtiger, wttest, unittest +import wiredtiger, wttest from wtscenario import make_scenarios # test_search_near02.py diff --git a/src/third_party/wiredtiger/test/suite/test_shared_cache02.py b/src/third_party/wiredtiger/test/suite/test_shared_cache02.py index f62b0342595..9ecdcb79b99 100644 --- a/src/third_party/wiredtiger/test/suite/test_shared_cache02.py +++ b/src/third_party/wiredtiger/test/suite/test_shared_cache02.py @@ -30,7 +30,6 @@ import os import shutil import wiredtiger, wttest -from wttest import unittest # test_shared_cache02.py # Shared cache tests diff --git a/src/third_party/wiredtiger/test/suite/test_split.py b/src/third_party/wiredtiger/test/suite/test_split.py index a44be554379..cbea939a8c1 100644 --- a/src/third_party/wiredtiger/test/suite/test_split.py +++ b/src/third_party/wiredtiger/test/suite/test_split.py @@ -30,7 +30,7 @@ # check that splits work as expected # -import wiredtiger, wttest +import wttest from wiredtiger import stat # Test splits diff --git a/src/third_party/wiredtiger/test/suite/test_stat01.py b/src/third_party/wiredtiger/test/suite/test_stat01.py index 8fa2249e59a..6a4ad5423ad 100755 --- a/src/third_party/wiredtiger/test/suite/test_stat01.py +++ b/src/third_party/wiredtiger/test/suite/test_stat01.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 helper, wiredtiger, wttest +import wiredtiger, wttest from wiredtiger import stat from wtdataset import SimpleDataSet, simple_key from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_stat02.py b/src/third_party/wiredtiger/test/suite/test_stat02.py index bb751003427..ff225ce1f2d 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat02.py +++ b/src/third_party/wiredtiger/test/suite/test_stat02.py @@ -27,9 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import itertools, wiredtiger, wttest -from suite_subprocess import suite_subprocess -from wtdataset import SimpleDataSet, SimpleLSMDataSet, ComplexDataSet, \ - ComplexLSMDataSet +from wtdataset import SimpleDataSet, SimpleLSMDataSet, ComplexDataSet, ComplexLSMDataSet from wtscenario import make_scenarios from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_stat03.py b/src/third_party/wiredtiger/test/suite/test_stat03.py index 0cff6c99076..fb3bc2fe0e3 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat03.py +++ b/src/third_party/wiredtiger/test/suite/test_stat03.py @@ -29,8 +29,7 @@ # [TEST_TAGS] # cursors:statistics # [END_TAGS] -import itertools, wiredtiger, wttest -from suite_subprocess import suite_subprocess +import wttest from wiredtiger import stat from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet diff --git a/src/third_party/wiredtiger/test/suite/test_stat04.py b/src/third_party/wiredtiger/test/suite/test_stat04.py index 8a8a9bcda4a..106f49883a2 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat04.py +++ b/src/third_party/wiredtiger/test/suite/test_stat04.py @@ -26,10 +26,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, struct from suite_subprocess import suite_subprocess from wtscenario import make_scenarios -import wiredtiger, wttest +import wttest from wiredtiger import stat # test_stat04.py diff --git a/src/third_party/wiredtiger/test/suite/test_stat05.py b/src/third_party/wiredtiger/test/suite/test_stat05.py index ff2c06c06f1..6de398c0524 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat05.py +++ b/src/third_party/wiredtiger/test/suite/test_stat05.py @@ -26,10 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import itertools, wiredtiger, wttest -from suite_subprocess import suite_subprocess +import wttest from wtscenario import make_scenarios -from wiredtiger import stat from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet # test_stat05.py diff --git a/src/third_party/wiredtiger/test/suite/test_stat06.py b/src/third_party/wiredtiger/test/suite/test_stat06.py index 14417185980..77c390e92e8 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat06.py +++ b/src/third_party/wiredtiger/test/suite/test_stat06.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 helper, wiredtiger, wttest +import wiredtiger, wttest from time import sleep from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_stat09.py b/src/third_party/wiredtiger/test/suite/test_stat09.py index a67487d2401..9a1710febd8 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat09.py +++ b/src/third_party/wiredtiger/test/suite/test_stat09.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import random -import wiredtiger, wttest +import wttest # test_stat09.py # Check oldest active read timestamp statistic diff --git a/src/third_party/wiredtiger/test/suite/test_stat10.py b/src/third_party/wiredtiger/test/suite/test_stat10.py index cb5212439a2..9bcfc2bc204 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat10.py +++ b/src/third_party/wiredtiger/test/suite/test_stat10.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import random -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_stat_log01.py b/src/third_party/wiredtiger/test/suite/test_stat_log01.py index 51e693cdf46..2f5fa1dec0e 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat_log01.py +++ b/src/third_party/wiredtiger/test/suite/test_stat_log01.py @@ -29,8 +29,7 @@ import glob import os.path import time -import helper, wiredtiger, wttest -from wiredtiger import stat +import wttest # test_stat_log01.py # Statistics log diff --git a/src/third_party/wiredtiger/test/suite/test_stat_log02.py b/src/third_party/wiredtiger/test/suite/test_stat_log02.py index cc808c388c9..ffff264bf5d 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat_log02.py +++ b/src/third_party/wiredtiger/test/suite/test_stat_log02.py @@ -31,8 +31,7 @@ # [END_TAGS] import glob, json -import helper, wiredtiger, wttest -from wiredtiger import stat +import wttest # test_stat_log02.py # Statistics log sources argument and JSON testing. diff --git a/src/third_party/wiredtiger/test/suite/test_sweep01.py b/src/third_party/wiredtiger/test/suite/test_sweep01.py index 879ea60297f..e0332da5a59 100644 --- a/src/third_party/wiredtiger/test/suite/test_sweep01.py +++ b/src/third_party/wiredtiger/test/suite/test_sweep01.py @@ -31,7 +31,7 @@ # with and without checkpoints. # -import fnmatch, os, shutil, run, time +import time from suite_subprocess import suite_subprocess from wtscenario import make_scenarios from wiredtiger import stat diff --git a/src/third_party/wiredtiger/test/suite/test_sweep02.py b/src/third_party/wiredtiger/test/suite/test_sweep02.py index de50770a75f..c30538464d6 100644 --- a/src/third_party/wiredtiger/test/suite/test_sweep02.py +++ b/src/third_party/wiredtiger/test/suite/test_sweep02.py @@ -30,7 +30,7 @@ # Test configuring and reconfiguring sweep options. # -import wiredtiger, wttest +import wttest class test_sweep02(wttest.WiredTigerTestCase): base_config = 'create,' diff --git a/src/third_party/wiredtiger/test/suite/test_sweep03.py b/src/third_party/wiredtiger/test/suite/test_sweep03.py index 074f9c61de2..92ff2b59b78 100644 --- a/src/third_party/wiredtiger/test/suite/test_sweep03.py +++ b/src/third_party/wiredtiger/test/suite/test_sweep03.py @@ -30,7 +30,7 @@ # Test to confirm if setting close_idle_time to 0 does not sweep old handles # -import fnmatch, os, shutil, run, time +import time from suite_subprocess import suite_subprocess from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_tiered02.py b/src/third_party/wiredtiger/test/suite/test_tiered02.py index 2041bcdf767..344a5732184 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered02.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered02.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, wiredtiger, wtscenario, wttest +import os, wttest from wtdataset import SimpleDataSet # test_tiered02.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered03.py b/src/third_party/wiredtiger/test/suite/test_tiered03.py index 2b86474c1d2..984243ee423 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered03.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered03.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. import os, re -import wiredtiger, wtscenario, wttest +import wtscenario, wttest from wtdataset import SimpleDataSet # test_tiered03.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered05.py b/src/third_party/wiredtiger/test/suite/test_tiered05.py index 1d199bad74b..29022fe93a7 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered05.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered05.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. import os, time, wiredtiger, wttest -from wiredtiger import stat StorageSource = wiredtiger.StorageSource # easy access to constants # test_tiered05.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered08.py b/src/third_party/wiredtiger/test/suite/test_tiered08.py index b06e84b5f12..468c23a3e22 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered08.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered08.py @@ -32,7 +32,7 @@ # [END_TAGS] # -import os, threading, time, wiredtiger, wttest +import os, threading, time, wttest from wiredtiger import stat from wtthread import checkpoint_thread, flush_tier_thread diff --git a/src/third_party/wiredtiger/test/suite/test_tiered09.py b/src/third_party/wiredtiger/test/suite/test_tiered09.py index 21be523dc7b..2da9a6c5803 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered09.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered09.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, time, wiredtiger, wttest -from wiredtiger import stat +import os, wiredtiger, wttest StorageSource = wiredtiger.StorageSource # easy access to constants # test_tiered09.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered10.py b/src/third_party/wiredtiger/test/suite/test_tiered10.py index 2e634ec6c18..1f18cd4fc16 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered10.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered10.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, time, wiredtiger, wttest -from wiredtiger import stat +import os, wiredtiger, wttest StorageSource = wiredtiger.StorageSource # easy access to constants # test_tiered10.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered11.py b/src/third_party/wiredtiger/test/suite/test_tiered11.py index adfe45926dc..8c83ba714e5 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered11.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered11.py @@ -26,8 +26,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, time, wiredtiger, wttest -from wiredtiger import stat +import os, wiredtiger, wttest StorageSource = wiredtiger.StorageSource # easy access to constants # test_tiered11.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered12.py b/src/third_party/wiredtiger/test/suite/test_tiered12.py index 5797ac779c9..214a028c108 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered12.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered12.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. import os, time, wiredtiger, wttest -from wiredtiger import stat StorageSource = wiredtiger.StorageSource # easy access to constants # test_tiered12.py diff --git a/src/third_party/wiredtiger/test/suite/test_tiered14.py b/src/third_party/wiredtiger/test/suite/test_tiered14.py index 8ec5c939329..3fb362b0679 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered14.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered14.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, random, wiredtiger, wtscenario, wttest +import os, random, wtscenario, wttest from wtdataset import TrackedSimpleDataSet, TrackedComplexDataSet # test_tiered14.py diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp03.py b/src/third_party/wiredtiger/test/suite/test_timestamp03.py index f0afbb7461d..32c47fe8730 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp03.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp03.py @@ -33,7 +33,7 @@ from helper import copy_wiredtiger_home import random from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_timestamp03(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp05.py b/src/third_party/wiredtiger/test/suite/test_timestamp05.py index 1c8a416515b..a241d4b7942 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp05.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp05.py @@ -30,9 +30,8 @@ # Timestamps: make sure they don't end up in metadata # -import random from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_timestamp05(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp06.py b/src/third_party/wiredtiger/test/suite/test_timestamp06.py index 79dd0703fee..056dafba81a 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp06.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp06.py @@ -33,7 +33,7 @@ from helper import copy_wiredtiger_home import random from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_timestamp06(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp11.py b/src/third_party/wiredtiger/test/suite/test_timestamp11.py index 5b72628942f..b11e1144b37 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp11.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp11.py @@ -31,7 +31,7 @@ # from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_timestamp11(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp12.py b/src/third_party/wiredtiger/test/suite/test_timestamp12.py index 03408863f74..adec986fd13 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp12.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp12.py @@ -30,7 +30,7 @@ # Timestamps: Test the use_timestamp setting when closing the connection. # -import shutil, os, wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_timestamp12(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp13.py b/src/third_party/wiredtiger/test/suite/test_timestamp13.py index 2bb121391ac..e8791ee0691 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp13.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp13.py @@ -30,7 +30,6 @@ # Timestamps: session query_timestamp # -import random from suite_subprocess import suite_subprocess import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp14.py b/src/third_party/wiredtiger/test/suite/test_timestamp14.py index f0540963785..27f428d9b9e 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp14.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp14.py @@ -30,7 +30,6 @@ # Global timestamps: oldest reader, all committed, pinned # -import random from suite_subprocess import suite_subprocess import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp16.py b/src/third_party/wiredtiger/test/suite/test_timestamp16.py index 990a08b3528..eadda9e0f20 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp16.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp16.py @@ -31,9 +31,8 @@ # end of a txn. # -import random from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest class test_timestamp16(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_timestamp16' diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp17.py b/src/third_party/wiredtiger/test/suite/test_timestamp17.py index f9ff1537fe5..688e32d5402 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp17.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp17.py @@ -33,7 +33,6 @@ # moved. # -import random from suite_subprocess import suite_subprocess import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp19.py b/src/third_party/wiredtiger/test/suite/test_timestamp19.py index 3ab88bd8858..8062197c6d2 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp19.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp19.py @@ -28,7 +28,7 @@ # # test_timestamp19.py # Use the oldest timestamp in the metadata as the oldest timestamp on restart. -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp22.py b/src/third_party/wiredtiger/test/suite/test_timestamp22.py index a49b2fc7890..6547ec00f68 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp22.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp22.py @@ -28,7 +28,7 @@ # # test_timestamp22.py # Misuse the timestamp API, making sure we don't crash. -import wiredtiger, wttest, re, suite_random +import wttest, re, suite_random from wtdataset import SimpleDataSet from contextlib import contextmanager from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp25.py b/src/third_party/wiredtiger/test/suite/test_timestamp25.py index 044f21b4abd..f7bf68db958 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp25.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp25.py @@ -30,7 +30,7 @@ # Timestamps: backward compatible oldest and stable names. # -import wiredtiger, wttest +import wttest from suite_subprocess import suite_subprocess class test_timestamp25(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_truncate02.py b/src/third_party/wiredtiger/test/suite/test_truncate02.py index f8913eb19df..234a941f8d7 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate02.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate02.py @@ -30,7 +30,7 @@ # session level operations on tables # -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_truncate03.py b/src/third_party/wiredtiger/test/suite/test_truncate03.py index 952c6ab166c..4cb69088795 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate03.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate03.py @@ -29,7 +29,7 @@ # test_truncate03.py # session level operations on tables -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet # A standalone test case that exercises address-deleted cells. diff --git a/src/third_party/wiredtiger/test/suite/test_truncate08.py b/src/third_party/wiredtiger/test/suite/test_truncate08.py index d2ef6484397..bb2274b53df 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate08.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate08.py @@ -30,7 +30,7 @@ # Check for prepare-conflict return after fast-truncate committed. # -import wiredtiger, wttest +import wttest from wtdataset import simple_key, simple_value from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_turtle01.py b/src/third_party/wiredtiger/test/suite/test_turtle01.py index 30e5c8e3f5a..361229bf497 100644 --- a/src/third_party/wiredtiger/test/suite/test_turtle01.py +++ b/src/third_party/wiredtiger/test/suite/test_turtle01.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import wiredtiger import wttest import re diff --git a/src/third_party/wiredtiger/test/suite/test_txn01.py b/src/third_party/wiredtiger/test/suite/test_txn01.py index 9f77ed3e1eb..b403069c825 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn01.py +++ b/src/third_party/wiredtiger/test/suite/test_txn01.py @@ -30,7 +30,7 @@ # transactions # [END_TAGS] -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_txn01.py diff --git a/src/third_party/wiredtiger/test/suite/test_txn02.py b/src/third_party/wiredtiger/test/suite/test_txn02.py index 3962b1bbef8..6f582ea5b43 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn02.py +++ b/src/third_party/wiredtiger/test/suite/test_txn02.py @@ -30,7 +30,7 @@ # Transactions: commits and rollbacks # -import fnmatch, os, shutil, time +import fnmatch, os, time from suite_subprocess import suite_subprocess from wtscenario import make_scenarios import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn03.py b/src/third_party/wiredtiger/test/suite/test_txn03.py index 7d528d7efd5..3e085f4c528 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn03.py +++ b/src/third_party/wiredtiger/test/suite/test_txn03.py @@ -30,7 +30,7 @@ # Transactions: using multiple cursor and session handles # -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_txn03(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_txn05.py b/src/third_party/wiredtiger/test/suite/test_txn05.py index 0eff1ae7fe5..7a4dc47f357 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn05.py +++ b/src/third_party/wiredtiger/test/suite/test_txn05.py @@ -30,7 +30,7 @@ # Transactions: commits and rollbacks # -import fnmatch, os, shutil, time +import fnmatch, os, time from suite_subprocess import suite_subprocess from wtscenario import make_scenarios import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn06.py b/src/third_party/wiredtiger/test/suite/test_txn06.py index 1bcdac1d4b0..bbb3f72c7ca 100755 --- a/src/third_party/wiredtiger/test/suite/test_txn06.py +++ b/src/third_party/wiredtiger/test/suite/test_txn06.py @@ -31,7 +31,7 @@ from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios class test_txn06(wttest.WiredTigerTestCase, suite_subprocess): diff --git a/src/third_party/wiredtiger/test/suite/test_txn07.py b/src/third_party/wiredtiger/test/suite/test_txn07.py index 350593c0b38..ea97283c191 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn07.py +++ b/src/third_party/wiredtiger/test/suite/test_txn07.py @@ -30,7 +30,7 @@ # Transactions: commits and rollbacks # -import fnmatch, os, shutil, run, time +import os from suite_subprocess import suite_subprocess from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_txn08.py b/src/third_party/wiredtiger/test/suite/test_txn08.py index 3337728b2bb..57734846887 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn08.py +++ b/src/third_party/wiredtiger/test/suite/test_txn08.py @@ -30,9 +30,7 @@ # Printlog: test Unicode output # -import fnmatch, os, shutil, run, time from suite_subprocess import suite_subprocess -from wiredtiger import stat import wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_txn09.py b/src/third_party/wiredtiger/test/suite/test_txn09.py index cd570132dac..e6e06982859 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn09.py +++ b/src/third_party/wiredtiger/test/suite/test_txn09.py @@ -30,7 +30,6 @@ # Transactions: recovery toggling logging # -import fnmatch, os, shutil, time from suite_subprocess import suite_subprocess from wtscenario import make_scenarios import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn10.py b/src/third_party/wiredtiger/test/suite/test_txn10.py index d4b4e96faae..9e0298f9bea 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn10.py +++ b/src/third_party/wiredtiger/test/suite/test_txn10.py @@ -30,7 +30,6 @@ # Transactions: commits and rollbacks # -import fnmatch, os, shutil, time from helper import simulate_crash_restart from suite_subprocess import suite_subprocess import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn11.py b/src/third_party/wiredtiger/test/suite/test_txn11.py index ae743b6718a..69279ab48ed 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn11.py +++ b/src/third_party/wiredtiger/test/suite/test_txn11.py @@ -29,7 +29,7 @@ # test_txn11.py # Transactions: Empty checkpoints and log removal. -import fnmatch, os, time +import fnmatch, os from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn12.py b/src/third_party/wiredtiger/test/suite/test_txn12.py index e836ef2bbbb..b943c3e0b44 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn12.py +++ b/src/third_party/wiredtiger/test/suite/test_txn12.py @@ -28,7 +28,6 @@ import wiredtiger, wttest from suite_subprocess import suite_subprocess -from wiredtiger import stat # test_txn12.py # test of commit following failed op in a read only transaction. diff --git a/src/third_party/wiredtiger/test/suite/test_txn14.py b/src/third_party/wiredtiger/test/suite/test_txn14.py index b25c9a88bf2..9f282c68de9 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn14.py +++ b/src/third_party/wiredtiger/test/suite/test_txn14.py @@ -30,7 +30,6 @@ # Transactions: commits and rollbacks # -import fnmatch, os, shutil, time from helper import simulate_crash_restart from suite_subprocess import suite_subprocess from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_txn15.py b/src/third_party/wiredtiger/test/suite/test_txn15.py index 28a16eab3d8..d3633cd6e15 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn15.py +++ b/src/third_party/wiredtiger/test/suite/test_txn15.py @@ -30,7 +30,6 @@ # Transactions: different sync modes # -import fnmatch, os, shutil, time from suite_subprocess import suite_subprocess from wiredtiger import stat from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_txn16.py b/src/third_party/wiredtiger/test/suite/test_txn16.py index 15898fe059e..8860ca0a653 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn16.py +++ b/src/third_party/wiredtiger/test/suite/test_txn16.py @@ -31,7 +31,7 @@ # continue to generate more log files. # -import fnmatch, os, shutil, time +import fnmatch, os, shutil from suite_subprocess import suite_subprocess import wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn18.py b/src/third_party/wiredtiger/test/suite/test_txn18.py index 4c5fda33b62..899191af794 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn18.py +++ b/src/third_party/wiredtiger/test/suite/test_txn18.py @@ -30,7 +30,7 @@ # Transactions: test recovery settings # -import fnmatch, os, shutil, time +import os, shutil from suite_subprocess import suite_subprocess import wiredtiger, wttest from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_txn19.py b/src/third_party/wiredtiger/test/suite/test_txn19.py index 3369fa376c1..4207c2d43a5 100755 --- a/src/third_party/wiredtiger/test/suite/test_txn19.py +++ b/src/third_party/wiredtiger/test/suite/test_txn19.py @@ -34,7 +34,7 @@ # Transactions: test recovery with corrupted log files # -import fnmatch, os, shutil, time +import os, shutil from wtscenario import make_scenarios from suite_subprocess import suite_subprocess import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn22.py b/src/third_party/wiredtiger/test/suite/test_txn22.py index cd1110ffbd0..6c74e190175 100755 --- a/src/third_party/wiredtiger/test/suite/test_txn22.py +++ b/src/third_party/wiredtiger/test/suite/test_txn22.py @@ -29,7 +29,7 @@ # test_txn22.py # Transactions: test salvage with removed -import fnmatch, os, shutil, time +import os, shutil from wtscenario import make_scenarios from suite_subprocess import suite_subprocess import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_txn23.py b/src/third_party/wiredtiger/test/suite/test_txn23.py index 1a194ba77ce..6cdb552ab6e 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn23.py +++ b/src/third_party/wiredtiger/test/suite/test_txn23.py @@ -30,7 +30,7 @@ # Transactions: ensure read timestamp is not cleared under cache pressure # -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_txn24.py b/src/third_party/wiredtiger/test/suite/test_txn24.py index 406faf5608f..86f9c691f3d 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn24.py +++ b/src/third_party/wiredtiger/test/suite/test_txn24.py @@ -31,8 +31,7 @@ # cache stuck issue. # -import wiredtiger, wttest -import time +import wttest from wtscenario import make_scenarios class test_txn24(wttest.WiredTigerTestCase): diff --git a/src/third_party/wiredtiger/test/suite/test_unicode01.py b/src/third_party/wiredtiger/test/suite/test_unicode01.py index 63f1b989862..8086e3a66f5 100755 --- a/src/third_party/wiredtiger/test/suite/test_unicode01.py +++ b/src/third_party/wiredtiger/test/suite/test_unicode01.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 sys, wiredtiger, wtscenario, wttest +import wttest # test_unicode01.py # Make sure UTF8 config can be passed to WT_SESSION::create. diff --git a/src/third_party/wiredtiger/test/suite/test_upgrade.py b/src/third_party/wiredtiger/test/suite/test_upgrade.py index b81dc4e21e1..363f305c627 100644 --- a/src/third_party/wiredtiger/test/suite/test_upgrade.py +++ b/src/third_party/wiredtiger/test/suite/test_upgrade.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, time import wiredtiger, wttest from wtdataset import SimpleDataSet, ComplexDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_util01.py b/src/third_party/wiredtiger/test/suite/test_util01.py index 324120e47e2..eaa55bcec79 100755 --- a/src/third_party/wiredtiger/test/suite/test_util01.py +++ b/src/third_party/wiredtiger/test/suite/test_util01.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 string, os, sys, random +import string, random from suite_subprocess import suite_subprocess import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_util02.py b/src/third_party/wiredtiger/test/suite/test_util02.py index 6bf165b1b22..cf97c7b4fef 100755 --- a/src/third_party/wiredtiger/test/suite/test_util02.py +++ b/src/third_party/wiredtiger/test/suite/test_util02.py @@ -26,8 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import string, os -import wiredtiger, wttest +import string +import wttest from suite_subprocess import suite_subprocess from wtdataset import ComplexDataSet from wtscenario import make_scenarios diff --git a/src/third_party/wiredtiger/test/suite/test_util07.py b/src/third_party/wiredtiger/test/suite/test_util07.py index 51eaceb2480..58a4394ab66 100644 --- a/src/third_party/wiredtiger/test/suite/test_util07.py +++ b/src/third_party/wiredtiger/test/suite/test_util07.py @@ -26,9 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, struct from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util07.py # Utilities: wt read diff --git a/src/third_party/wiredtiger/test/suite/test_util08.py b/src/third_party/wiredtiger/test/suite/test_util08.py index 377e5c79a36..3f0e4d6f74e 100644 --- a/src/third_party/wiredtiger/test/suite/test_util08.py +++ b/src/third_party/wiredtiger/test/suite/test_util08.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util08.py # Utilities: wt copyright diff --git a/src/third_party/wiredtiger/test/suite/test_util09.py b/src/third_party/wiredtiger/test/suite/test_util09.py index 23fa805255f..a7e5a8cd85b 100644 --- a/src/third_party/wiredtiger/test/suite/test_util09.py +++ b/src/third_party/wiredtiger/test/suite/test_util09.py @@ -26,9 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, struct from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util09.py # Utilities: wt loadtext diff --git a/src/third_party/wiredtiger/test/suite/test_util11.py b/src/third_party/wiredtiger/test/suite/test_util11.py index a91d4b9f9fa..fd4e359e279 100644 --- a/src/third_party/wiredtiger/test/suite/test_util11.py +++ b/src/third_party/wiredtiger/test/suite/test_util11.py @@ -30,9 +30,8 @@ # wt_util # [END_TAGS] -import os, struct from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util11.py # Utilities: wt list diff --git a/src/third_party/wiredtiger/test/suite/test_util12.py b/src/third_party/wiredtiger/test/suite/test_util12.py index fcbb12447b8..5cc7bf053be 100644 --- a/src/third_party/wiredtiger/test/suite/test_util12.py +++ b/src/third_party/wiredtiger/test/suite/test_util12.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_util13.py b/src/third_party/wiredtiger/test/suite/test_util13.py index 192674da1d6..e47c41f4369 100644 --- a/src/third_party/wiredtiger/test/suite/test_util13.py +++ b/src/third_party/wiredtiger/test/suite/test_util13.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, re, string +import os, re from suite_subprocess import suite_subprocess from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet import wiredtiger, wttest diff --git a/src/third_party/wiredtiger/test/suite/test_util14.py b/src/third_party/wiredtiger/test/suite/test_util14.py index 7ff33b85df4..d46b7ca468f 100644 --- a/src/third_party/wiredtiger/test/suite/test_util14.py +++ b/src/third_party/wiredtiger/test/suite/test_util14.py @@ -28,7 +28,7 @@ import os from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util14.py # Utilities: wt truncate diff --git a/src/third_party/wiredtiger/test/suite/test_util15.py b/src/third_party/wiredtiger/test/suite/test_util15.py index 4258c0241f3..c7a28488937 100644 --- a/src/third_party/wiredtiger/test/suite/test_util15.py +++ b/src/third_party/wiredtiger/test/suite/test_util15.py @@ -28,7 +28,7 @@ import os from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util15.py # Utilities: wt alter diff --git a/src/third_party/wiredtiger/test/suite/test_util16.py b/src/third_party/wiredtiger/test/suite/test_util16.py index 45a26a60e16..5960e120e9e 100644 --- a/src/third_party/wiredtiger/test/suite/test_util16.py +++ b/src/third_party/wiredtiger/test/suite/test_util16.py @@ -28,7 +28,7 @@ import os from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util16.py # Utilities: wt rename diff --git a/src/third_party/wiredtiger/test/suite/test_util17.py b/src/third_party/wiredtiger/test/suite/test_util17.py index 4dd76d298c6..c7edebce82c 100644 --- a/src/third_party/wiredtiger/test/suite/test_util17.py +++ b/src/third_party/wiredtiger/test/suite/test_util17.py @@ -28,7 +28,7 @@ import os from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest # test_util17.py # Utilities: wt stat diff --git a/src/third_party/wiredtiger/test/suite/test_util18.py b/src/third_party/wiredtiger/test/suite/test_util18.py index c1c7d6971cc..db51c564fb2 100644 --- a/src/third_party/wiredtiger/test/suite/test_util18.py +++ b/src/third_party/wiredtiger/test/suite/test_util18.py @@ -28,7 +28,7 @@ import codecs, filecmp from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_util18.py diff --git a/src/third_party/wiredtiger/test/suite/test_util19.py b/src/third_party/wiredtiger/test/suite/test_util19.py index ecf5d8f798b..d58ffd4c5c3 100644 --- a/src/third_party/wiredtiger/test/suite/test_util19.py +++ b/src/third_party/wiredtiger/test/suite/test_util19.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtscenario import make_scenarios # test_util19.py diff --git a/src/third_party/wiredtiger/test/suite/test_util20.py b/src/third_party/wiredtiger/test/suite/test_util20.py index 40d5429a4be..d43407eb9d1 100644 --- a/src/third_party/wiredtiger/test/suite/test_util20.py +++ b/src/third_party/wiredtiger/test/suite/test_util20.py @@ -27,7 +27,7 @@ # OTHER DEALINGS IN THE SOFTWARE. from suite_subprocess import suite_subprocess -import wiredtiger, wttest +import wttest from wtdataset import SimpleDataSet, ComplexDataSet # test_util20.py diff --git a/src/third_party/wiredtiger/test/suite/test_verbose03.py b/src/third_party/wiredtiger/test/suite/test_verbose03.py index eaff25d8460..37788a8ca87 100755 --- a/src/third_party/wiredtiger/test/suite/test_verbose03.py +++ b/src/third_party/wiredtiger/test/suite/test_verbose03.py @@ -27,7 +27,6 @@ # OTHER DEALINGS IN THE SOFTWARE. # -from suite_subprocess import suite_subprocess from contextlib import contextmanager import wiredtiger, wttest from test_verbose01 import test_verbose_base diff --git a/src/third_party/wiredtiger/test/suite/wtdataset.py b/src/third_party/wiredtiger/test/suite/wtdataset.py index a7fd0ed63ac..7839cff8a04 100755 --- a/src/third_party/wiredtiger/test/suite/wtdataset.py +++ b/src/third_party/wiredtiger/test/suite/wtdataset.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. # -import sys class BaseDataSet(object): """ diff --git a/src/third_party/wiredtiger/test/suite/wthooks.py b/src/third_party/wiredtiger/test/suite/wthooks.py index 56827350e29..80d375f32f9 100755 --- a/src/third_party/wiredtiger/test/suite/wthooks.py +++ b/src/third_party/wiredtiger/test/suite/wthooks.py @@ -35,7 +35,6 @@ # from __future__ import print_function -import os, sys from importlib import import_module from abc import ABC, abstractmethod import wiredtiger diff --git a/src/third_party/wiredtiger/test/suite/wtscenario.py b/src/third_party/wiredtiger/test/suite/wtscenario.py index b464cf206e7..44515b555de 100755 --- a/src/third_party/wiredtiger/test/suite/wtscenario.py +++ b/src/third_party/wiredtiger/test/suite/wtscenario.py @@ -26,7 +26,6 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import testscenarios import suite_random # wtscenarios.py diff --git a/src/third_party/wiredtiger/test/suite/wtthread.py b/src/third_party/wiredtiger/test/suite/wtthread.py index 6e15f85dfb6..e4620e188e0 100755 --- a/src/third_party/wiredtiger/test/suite/wtthread.py +++ b/src/third_party/wiredtiger/test/suite/wtthread.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, queue, shutil, sys, threading, time, wiredtiger, wttest +import os, queue, shutil, threading, time, wiredtiger, wttest from helper import compare_tables class checkpoint_thread(threading.Thread): |