summaryrefslogtreecommitdiff
path: root/test/suite/test_encrypt03.py
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2015-05-07 11:53:27 +1000
committerMichael Cahill <michael.cahill@mongodb.com>2015-05-07 11:53:27 +1000
commit29896a00029f14d1795eb04df3ecba374e4f4d2d (patch)
tree31a356661810e9f0462b4815c3e2f8a00157df8e /test/suite/test_encrypt03.py
parentabc534bfbcb654d76f9b05d8d612fdc456a64135 (diff)
downloadmongo-29896a00029f14d1795eb04df3ecba374e4f4d2d.tar.gz
Clip a test for tables with an empty encryption name: that now means that the system encryption should be inherited.
Diffstat (limited to 'test/suite/test_encrypt03.py')
-rw-r--r--test/suite/test_encrypt03.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/suite/test_encrypt03.py b/test/suite/test_encrypt03.py
index ac1fbe5d03a..0e06d4491ca 100644
--- a/test/suite/test_encrypt03.py
+++ b/test/suite/test_encrypt03.py
@@ -43,8 +43,10 @@ class test_encrypt03(wttest.WiredTigerTestCase):
encrypt = [
('none', dict( sys_encrypt='none', sys_encrypt_args='',
file_encrypt='rotn', file_encrypt_args=',keyid=13')),
- ('noname', dict( sys_encrypt='rotn', sys_encrypt_args=',keyid=11',
- file_encrypt='none', file_encrypt_args=',keyid=13')),
+ # This case is now permitted: it the system encryption is inherited by
+ # the table.
+ #('noname', dict( sys_encrypt='rotn', sys_encrypt_args=',keyid=11',
+ # file_encrypt='none', file_encrypt_args=',keyid=13')),
]
scenarios = number_scenarios(multiply_scenarios('.', types, encrypt))