summaryrefslogtreecommitdiff
path: root/test/suite
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2016-02-18 14:00:00 +1100
committerMichael Cahill <michael.cahill@mongodb.com>2016-02-18 14:00:00 +1100
commit5cdd3e320cb19cd54111c2572a3d6e33d3009ad4 (patch)
treeaa11f6aa045af0ab4b06b1e4ac59782806a969e3 /test/suite
parent5e3a56f0abb433a23e0b8cb8f9a0c86c2d6ad80f (diff)
parent563b7823f74dcd219740945aa7067de0927ee9df (diff)
downloadmongo-5cdd3e320cb19cd54111c2572a3d6e33d3009ad4.tar.gz
Merge branch 'mongodb-3.2.3' into mongodb-3.2mongodb-3.2.4
Diffstat (limited to 'test/suite')
-rw-r--r--test/suite/test_compress01.py1
-rw-r--r--test/suite/test_cursor08.py1
-rw-r--r--test/suite/test_encrypt01.py2
-rw-r--r--test/suite/test_txn07.py1
4 files changed, 0 insertions, 5 deletions
diff --git a/test/suite/test_compress01.py b/test/suite/test_compress01.py
index e97953a53cd..94c748fc3e5 100644
--- a/test/suite/test_compress01.py
+++ b/test/suite/test_compress01.py
@@ -42,7 +42,6 @@ class test_compress01(wttest.WiredTigerTestCase):
('table', dict(uri='table:test_compress01')),
]
compress = [
- ('bzip2', dict(compress='bzip2')),
('nop', dict(compress='nop')),
('snappy', dict(compress='snappy')),
('none', dict(compress=None)),
diff --git a/test/suite/test_cursor08.py b/test/suite/test_cursor08.py
index f7bd37a2a3c..1a379518224 100644
--- a/test/suite/test_cursor08.py
+++ b/test/suite/test_cursor08.py
@@ -47,7 +47,6 @@ class test_cursor08(wttest.WiredTigerTestCase, suite_subprocess):
('reopen', dict(reopen=True))
])
compress = check_scenarios([
- ('bzip2', dict(compress='bzip2')),
('nop', dict(compress='nop')),
('snappy', dict(compress='snappy')),
('zlib', dict(compress='zlib')),
diff --git a/test/suite/test_encrypt01.py b/test/suite/test_encrypt01.py
index 0521f7c8e8a..0f2782204d2 100644
--- a/test/suite/test_encrypt01.py
+++ b/test/suite/test_encrypt01.py
@@ -55,10 +55,8 @@ class test_encrypt01(wttest.WiredTigerTestCase):
('none', dict(log_compress=None, block_compress=None)),
('nop', dict(log_compress='nop', block_compress='nop')),
('lz4', dict(log_compress='lz4', block_compress='lz4')),
- ('bzip2', dict(log_compress='bzip2', block_compress='bzip2')),
('snappy', dict(log_compress='snappy', block_compress='snappy')),
('zlib', dict(log_compress='zlib', block_compress='zlib')),
- ('bzip2-none', dict(log_compress='bzip2', block_compress=None)),
('none-snappy', dict(log_compress=None, block_compress='snappy')),
('snappy-lz4', dict(log_compress='snappy', block_compress='lz4')),
]
diff --git a/test/suite/test_txn07.py b/test/suite/test_txn07.py
index 94c26990178..f74120e3590 100644
--- a/test/suite/test_txn07.py
+++ b/test/suite/test_txn07.py
@@ -64,7 +64,6 @@ class test_txn07(wttest.WiredTigerTestCase, suite_subprocess):
]
txn1s = [('t1c', dict(txn1='commit')), ('t1r', dict(txn1='rollback'))]
compress = [
- ('bzip2', dict(compress='bzip2')),
('nop', dict(compress='nop')),
('snappy', dict(compress='snappy')),
('zlib', dict(compress='zlib')),