diff options
42 files changed, 94 insertions, 178 deletions
diff --git a/test/suite/suite_random.py b/test/suite/suite_random.py index c0e0a2a9d85..3515c8c3e44 100644 --- a/test/suite/suite_random.py +++ b/test/suite/suite_random.py @@ -24,11 +24,9 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# suite_random.py -# A quick and predictable pseudo random number generator. -# +# suite_random.py +# A quick and predictable pseudo random number generator. class suite_random: """ Generate random 32 bit integers that are predictable, diff --git a/test/suite/suite_subprocess.py b/test/suite/suite_subprocess.py index f61b9cbd589..695e0a2ae7e 100644 --- a/test/suite/suite_subprocess.py +++ b/test/suite/suite_subprocess.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# suite_subprocess.py -# Run a subprocess within the test suite -# -from run import wt_builddir import os, subprocess +from run import wt_builddir +# suite_subprocess.py +# Run a subprocess within the test suite # Used as a 'mixin' class along with a WiredTigerTestCase class class suite_subprocess: subproc = None diff --git a/test/suite/test_backup.py b/test/suite/test_backup.py index ee139b6d398..959d3e93fdd 100644 --- a/test/suite/test_backup.py +++ b/test/suite/test_backup.py @@ -24,10 +24,6 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_backup.py -# Utilities: wt backup -# import shutil, string, os from suite_subprocess import suite_subprocess @@ -35,6 +31,8 @@ import wiredtiger, wttest from helper import compareFiles, confirmDoesNotExist, \ complexPopulate, complexPopulateCheck, simplePopulate, simplePopulateCheck +# test_backup.py +# Utilities: wt backup # Test backup (both backup cursors and the wt backup command). class test_backup(wttest.WiredTigerTestCase, suite_subprocess): dir='backup.dir' # Backup directory name diff --git a/test/suite/test_base01.py b/test/suite/test_base01.py index b7f0add2929..d67b2eb47f4 100644 --- a/test/suite/test_base01.py +++ b/test/suite/test_base01.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_base01.py -# Basic operations -# import wiredtiger, wttest +# test_base01.py +# Basic operations class test_base01(wttest.WiredTigerTestCase): """ Test basic operations diff --git a/test/suite/test_base03.py b/test/suite/test_base03.py index 05f0e531271..daabd0541fc 100644 --- a/test/suite/test_base03.py +++ b/test/suite/test_base03.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_base03.py -# Cursor operations -# import wiredtiger, wttest +# test_base03.py +# Cursor operations class test_base03(wttest.WiredTigerTestCase): """ Test basic operations diff --git a/test/suite/test_base04.py b/test/suite/test_base04.py index bb4e9915285..ec536a4a580 100644 --- a/test/suite/test_base04.py +++ b/test/suite/test_base04.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_base04.py -# Test that tables are reconciled correctly when they are empty. -# import wiredtiger, wttest +# test_base04.py +# Test that tables are reconciled correctly when they are empty. class test_base04(wttest.WiredTigerTestCase): '''Test various tree types becoming empty''' diff --git a/test/suite/test_base05.py b/test/suite/test_base05.py index 667145f2fc3..e7e542fb21f 100644 --- a/test/suite/test_base05.py +++ b/test/suite/test_base05.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_base05.py -# Cursor operations -# import wiredtiger, wttest +# test_base05.py +# Cursor operations class test_base05(wttest.WiredTigerTestCase): """ Test that various types of content can be stored diff --git a/test/suite/test_checkpoint01.py b/test/suite/test_checkpoint01.py index 6083e34d05e..1c4268a701c 100644 --- a/test/suite/test_checkpoint01.py +++ b/test/suite/test_checkpoint01.py @@ -24,13 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_checkpoint01.py -# Checkpoint tests import wiredtiger, wttest from helper import keyPopulate, simplePopulate +# test_checkpoint01.py +# Checkpoint tests # General checkpoint test: create an object containing sets of data associated # with a set of checkpoints, then confirm the checkpoint's values are correct, # including after other checkpoints are dropped. diff --git a/test/suite/test_config01.py b/test/suite/test_config01.py index 7fcff6935cd..cb5907cc70c 100644 --- a/test/suite/test_config01.py +++ b/test/suite/test_config01.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_config01.py -# Configuration strings for wiredtiger_open -# import wiredtiger, wtscenario, wttest import test_base03 +# test_config01.py +# Configuration strings for wiredtiger_open class test_config01(test_base03.test_base03): scenarios = wtscenario.wtscenario.session_create_scenario() diff --git a/test/suite/test_config02.py b/test/suite/test_config02.py index b3bee77436d..cf6bb96b49f 100644 --- a/test/suite/test_config02.py +++ b/test/suite/test_config02.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_config01.py -# The home directory for wiredtiger_open -# import os import wiredtiger, wttest +# test_config01.py +# The home directory for wiredtiger_open class test_config02(wttest.WiredTigerTestCase): table_name1 = 'test_config02' nentries = 100 @@ -82,7 +80,7 @@ class test_config02(wttest.WiredTigerTestCase): configarg += ',' + configextra if homeenv == None: os.unsetenv('WIREDTIGER_HOME') - else: + else: os.putenv('WIREDTIGER_HOME', homeenv) self.conn = wiredtiger.wiredtiger_open(homearg, configarg) self.session = self.conn.open_session(None) diff --git a/test/suite/test_config03.py b/test/suite/test_config03.py index a76b67cd76f..903a98c6d3b 100644 --- a/test/suite/test_config03.py +++ b/test/suite/test_config03.py @@ -24,15 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_config03.py -# More configuration strings for wiredtiger_open, -# combined probabilistically. -# import wiredtiger, wtscenario, wttest import test_base03 +# test_config03.py +# More configuration strings for wiredtiger_open, combined probabilistically. class test_config03(test_base03.test_base03): K = 1024 M = 1024 * K diff --git a/test/suite/test_config04.py b/test/suite/test_config04.py index e7a731d2ed2..52bcf6ee79f 100644 --- a/test/suite/test_config04.py +++ b/test/suite/test_config04.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_config04.py -# Individually test config options -# import os import wiredtiger, wttest +# test_config04.py +# Individually test config options class test_config04(wttest.WiredTigerTestCase): table_name1 = 'test_config04' nentries = 100 diff --git a/test/suite/test_config05.py b/test/suite/test_config05.py index 493531aa063..8a3c06e3901 100644 --- a/test/suite/test_config05.py +++ b/test/suite/test_config05.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_config05.py -# Test multiple connection opens -# import wiredtiger, wttest +# test_config05.py +# Test multiple connection opens class test_config05(wttest.WiredTigerTestCase): table_name1 = 'test_config05' nentries = 100 diff --git a/test/suite/test_cursor01.py b/test/suite/test_cursor01.py index 785583bfec8..270180180fc 100644 --- a/test/suite/test_cursor01.py +++ b/test/suite/test_cursor01.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_cursor01.py -# Cursor operations -# import wiredtiger, wttest +# test_cursor01.py +# Cursor operations # Basic smoke-test of file and table cursors: tests get/set key, insert # and forward/backward iteration, and mostly because we don't test them # anywhere else, cursor duplication and equality. diff --git a/test/suite/test_cursor02.py b/test/suite/test_cursor02.py index a25d4cfb3aa..4e09deb8f48 100644 --- a/test/suite/test_cursor02.py +++ b/test/suite/test_cursor02.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_cursor02.py -# Cursor operations on small tables. -# import wiredtiger from test_cursor_tracker import TestCursorTracker +# test_cursor02.py +# Cursor operations on small tables. class test_cursor02(TestCursorTracker): """ Cursor operations on small tables of each access method. diff --git a/test/suite/test_cursor03.py b/test/suite/test_cursor03.py index 91470984725..2f4715e5508 100644 --- a/test/suite/test_cursor03.py +++ b/test/suite/test_cursor03.py @@ -24,16 +24,14 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_cursor02.py -# Cursor operations on tables of various sizes, -# with key/values of various sizes. -# import wiredtiger from test_cursor_tracker import TestCursorTracker from wtscenario import multiply_scenarios +# test_cursor03.py +# Cursor operations on tables of various sizes, with key/values of various +# sizes. class test_cursor03(TestCursorTracker): """ Cursor operations on small tables of each access method. diff --git a/test/suite/test_cursor04.py b/test/suite/test_cursor04.py index 0be30e73ce1..55c312b2cfd 100644 --- a/test/suite/test_cursor04.py +++ b/test/suite/test_cursor04.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_base03.py -# Cursor operations -# import wiredtiger, wttest +# test_base04.py +# Cursor operations class test_cursor04(wttest.WiredTigerTestCase): """ Test cursor search and search_near diff --git a/test/suite/test_cursor05.py b/test/suite/test_cursor05.py index 70b31f65469..ef4aed81a3a 100644 --- a/test/suite/test_cursor05.py +++ b/test/suite/test_cursor05.py @@ -24,15 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_cursor05.py -# Test cursors at the point where a cursor is first -# initialized, and when it hits an endpoint. -# Mix that in with column groups. -# import wiredtiger, wttest +# test_cursor05.py +# Test cursors at the point where a cursor is first initialized, and when it +# hits an endpoint. Mix that in with column groups. class test_cursor05(wttest.WiredTigerTestCase): """ Test basic operations diff --git a/test/suite/test_drop.py b/test/suite/test_drop.py index b51ccf2bdaf..0d19c58ff92 100644 --- a/test/suite/test_drop.py +++ b/test/suite/test_drop.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_drop.py -# session level drop operation import os, time import wiredtiger, wttest from helper import confirmDoesNotExist, complexPopulate, simplePopulate -# Test session.drop operations. +# test_drop.py +# session level drop operation class test_drop(wttest.WiredTigerTestCase): name = 'test_drop' diff --git a/test/suite/test_drop_create.py b/test/suite/test_drop_create.py index cf18cd823b4..444a1d6c20b 100644 --- a/test/suite/test_drop_create.py +++ b/test/suite/test_drop_create.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_drop_create.py -# Test dropping and creating -# import wiredtiger, wttest +# test_drop_create.py +# Test dropping and creating class test_drop_create(wttest.WiredTigerTestCase): def test_drop_create(self): s, self.session = self.session, None diff --git a/test/suite/test_index01.py b/test/suite/test_index01.py index b807a5e4e6c..56a22e3d5fe 100644 --- a/test/suite/test_index01.py +++ b/test/suite/test_index01.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_index01.py -# basic tests for indices -# import wiredtiger, wttest +# test_index01.py +# basic tests for indices class test_index01(wttest.WiredTigerTestCase): '''Test basic operations for indices''' diff --git a/test/suite/test_priv01.py b/test/suite/test_priv01.py index 697b40a7fd2..e29dc3a0455 100644 --- a/test/suite/test_priv01.py +++ b/test/suite/test_priv01.py @@ -24,17 +24,14 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_priv01.py -# Test privileged operations. -# This is a variant of test_config02.py. -# This test should be run as both normal and privileged -# (e.g. root) user, and should pass in both cases. -# import os import wiredtiger, wttest +# test_priv01.py +# Test privileged operations. +# This is a variant of test_config02.py. This test should be run as both +# normal and privileged (e.g. root) user, and should pass in both cases. class test_priv01(wttest.WiredTigerTestCase): """ This tests privileged operations. diff --git a/test/suite/test_rename.py b/test/suite/test_rename.py index 780c0929c27..e51d328601e 100644 --- a/test/suite/test_rename.py +++ b/test/suite/test_rename.py @@ -24,17 +24,15 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_rename.py -# session level rename operation -# import os, time import wiredtiger, wttest from helper import confirmDoesNotExist,\ complexPopulate, complexPopulateCheck, simplePopulate, simplePopulateCheck -# Test session.rename operations. +# +# test_rename.py +# session level rename operation class test_rename(wttest.WiredTigerTestCase): name1 = 'test_rename1' name2 = 'test_rename2' diff --git a/test/suite/test_schema01.py b/test/suite/test_schema01.py index fe97893aa67..30d563c45c1 100644 --- a/test/suite/test_schema01.py +++ b/test/suite/test_schema01.py @@ -24,10 +24,6 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_schema01.py -# Test that tables are reconciled correctly when they are empty. -# import wiredtiger, wttest @@ -46,6 +42,8 @@ expected_out = [ r"['USA\x00\x00', 2009, 307006550]" ] +# test_schema01.py +# Test that tables are reconciled correctly when they are empty. class test_schema01(wttest.WiredTigerTestCase): '''Test various tree types becoming empty''' diff --git a/test/suite/test_schema02.py b/test/suite/test_schema02.py index ba241504ee6..b6622dd7046 100644 --- a/test/suite/test_schema02.py +++ b/test/suite/test_schema02.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_schema02.py -# Columns, column groups, indexes -# import wiredtiger, wttest +# test_schema02.py +# Columns, column groups, indexes class test_schema02(wttest.WiredTigerTestCase): """ Test basic operations diff --git a/test/suite/test_schema03.py b/test/suite/test_schema03.py index ea6a9343ab3..2ea9ca6d18b 100644 --- a/test/suite/test_schema03.py +++ b/test/suite/test_schema03.py @@ -24,17 +24,15 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_schema03.py -# Bigger, more 'randomly generated' schemas and data. -# This test is complex. If it fails, rerun with -# modified values for SHOW_PYTHON* variables. -# import resource import suite_random import wiredtiger, wtscenario, wttest +# test_schema03.py +# Bigger, more 'randomly generated' schemas and data. +# This test is complex. If it fails, rerun with modified values for +# SHOW_PYTHON* variables. def extract_random_from_list(rand, list): pos = rand.rand_range(0, len(list)) result = list[pos] diff --git a/test/suite/test_stat01.py b/test/suite/test_stat01.py index b27492dc9dd..21bfddd8af7 100644 --- a/test/suite/test_stat01.py +++ b/test/suite/test_stat01.py @@ -24,13 +24,11 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_stat01.py -# Statistics operations -# import wiredtiger, wttest +# test_stat01.py +# Statistics operations class test_stat01(wttest.WiredTigerTestCase): """ Test statistics diff --git a/test/suite/test_txn01.py b/test/suite/test_txn01.py index 172f0f27f98..5c93da3f5d2 100644 --- a/test/suite/test_txn01.py +++ b/test/suite/test_txn01.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_txn01.py -# Transactions: basic functionality -# import os, struct import wiredtiger, wttest +# test_txn01.py +# Transactions: basic functionality class test_txn01(wttest.WiredTigerTestCase): tablename = 'test_txn01' uri = 'table:' + tablename diff --git a/test/suite/test_util01.py b/test/suite/test_util01.py index fa24fb27444..f598f94b658 100644 --- a/test/suite/test_util01.py +++ b/test/suite/test_util01.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util01.py -# Utilities: wt dump, as well as the dump cursor -# import string, os from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util01.py +# Utilities: wt dump, as well as the dump cursor class test_util01(wttest.WiredTigerTestCase, suite_subprocess): """ Test wt dump. We check for specific output. diff --git a/test/suite/test_util02.py b/test/suite/test_util02.py index b5d0e98b5f3..32aa158fb21 100644 --- a/test/suite/test_util02.py +++ b/test/suite/test_util02.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util02.py -# Utilities: wt load -# import string, os from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util02.py +# Utilities: wt load class test_util02(wttest.WiredTigerTestCase, suite_subprocess): """ Test wt load diff --git a/test/suite/test_util03.py b/test/suite/test_util03.py index 7baf2d47b29..19396098581 100644 --- a/test/suite/test_util03.py +++ b/test/suite/test_util03.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util03.py -# Utilities: wt create -# from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util03.py +# Utilities: wt create class test_util03(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util03.a' nentries = 1000 diff --git a/test/suite/test_util04.py b/test/suite/test_util04.py index fbb91a5f7c2..aa0ca079cc8 100644 --- a/test/suite/test_util04.py +++ b/test/suite/test_util04.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util04.py -# Utilities: wt drop -# import os from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util04.py +# Utilities: wt drop class test_util04(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util04.a' nentries = 1000 diff --git a/test/suite/test_util05.py b/test/suite/test_util05.py index 5139e71d67b..05768719be0 100644 --- a/test/suite/test_util05.py +++ b/test/suite/test_util05.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util05.py -# Utilities: wt verify -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util05.py +# Utilities: wt verify class test_util05(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util05.a' nentries = 1000 diff --git a/test/suite/test_util06.py b/test/suite/test_util06.py index d49c85469d6..bda52f8dac7 100644 --- a/test/suite/test_util06.py +++ b/test/suite/test_util06.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util06.py -# Utilities: wt salvage -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util06.py +# Utilities: wt salvage class test_util06(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util06.a' nentries = 1000 diff --git a/test/suite/test_util07.py b/test/suite/test_util07.py index bd7449d25a9..2a0e020d71d 100644 --- a/test/suite/test_util07.py +++ b/test/suite/test_util07.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util07.py -# Utilities: wt read -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util07.py +# Utilities: wt read class test_util07(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util07.a' nentries = 1000 diff --git a/test/suite/test_util08.py b/test/suite/test_util08.py index 9d460cd8560..a1cdee26484 100644 --- a/test/suite/test_util08.py +++ b/test/suite/test_util08.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util08.py -# Utilities: wt copyright -# from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util08.py +# Utilities: wt copyright class test_util08(wttest.WiredTigerTestCase, suite_subprocess): def test_copyright(self): """ diff --git a/test/suite/test_util09.py b/test/suite/test_util09.py index cdcc7fd38df..11fb548f4b2 100644 --- a/test/suite/test_util09.py +++ b/test/suite/test_util09.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util09.py -# Utilities: wt loadtext -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util09.py +# Utilities: wt loadtext class test_util09(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util09.a' nentries = 1000 diff --git a/test/suite/test_util10.py b/test/suite/test_util10.py index faaefdef005..82d3cfb0094 100644 --- a/test/suite/test_util10.py +++ b/test/suite/test_util10.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util10.py -# Utilities: wt dumpfile -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util10.py +# Utilities: wt dumpfile class test_util10(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util10.a' nentries = 1000 diff --git a/test/suite/test_util11.py b/test/suite/test_util11.py index fa767953cd2..f32ce8f18ed 100644 --- a/test/suite/test_util11.py +++ b/test/suite/test_util11.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util11.py -# Utilities: wt list -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util11.py +# Utilities: wt list class test_util11(wttest.WiredTigerTestCase, suite_subprocess): tablenamepfx = 'test_util11.' session_params = 'key_format=S,value_format=S' diff --git a/test/suite/test_util12.py b/test/suite/test_util12.py index 5b3fec9c0a2..c529e4d40ca 100644 --- a/test/suite/test_util12.py +++ b/test/suite/test_util12.py @@ -24,15 +24,13 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# test_util12.py -# Utilities: wt write -# import os, struct from suite_subprocess import suite_subprocess import wiredtiger, wttest +# test_util12.py +# Utilities: wt write class test_util12(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util12.a' session_params = 'key_format=S,value_format=S' diff --git a/test/suite/valgrind-python.supp b/test/suite/valgrind-python.supp index 43c99c4a3af..dd7c2d60adf 100644 --- a/test/suite/valgrind-python.supp +++ b/test/suite/valgrind-python.supp @@ -3,9 +3,9 @@ # # Here's an example of running valgrind: # -# cd python/dist/src -# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \ -# ./python -E -tt ./Lib/test/regrtest.py -u bsddb,network +# cd python/dist/src +# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \ +# ./python -E -tt ./Lib/test/regrtest.py -u bsddb,network # # You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER # to use the preferred suppressions with Py_ADDRESS_IN_RANGE. diff --git a/test/suite/wtscenario.py b/test/suite/wtscenario.py index 82322d65cb2..6286a623a8c 100644 --- a/test/suite/wtscenario.py +++ b/test/suite/wtscenario.py @@ -24,14 +24,12 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -# -# wtscenarios.py -# Support scenarios based testing -# import testscenarios import suite_random +# wtscenarios.py +# Support scenarios based testing def powerrange(start, stop, mult): """ Like xrange, generates a range from start to stop. |