diff options
author | David Hows <david.hows@mongodb.com> | 2017-01-23 16:05:51 +1100 |
---|---|---|
committer | David Hows <david.hows@mongodb.com> | 2017-01-23 16:06:16 +1100 |
commit | 48a3cbc17fa902528217287fd075c87efb44aebc (patch) | |
tree | fff4f814ab9fbd7f3eb4c45684f581a5da1c058c /test/suite/test_encrypt01.py | |
parent | 8d2324943364286056ae399043f70b8a937de312 (diff) | |
parent | bf8de9767982da9ae0f1542f3744c8aa8544fb82 (diff) | |
download | mongodb-3.5.2.tar.gz |
Merge branch 'develop' into mongodb-3.6mongodb-3.5.3mongodb-3.5.2
Diffstat (limited to 'test/suite/test_encrypt01.py')
-rw-r--r-- | test/suite/test_encrypt01.py | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/test/suite/test_encrypt01.py b/test/suite/test_encrypt01.py index 746c9d13e96..317bed93246 100644 --- a/test/suite/test_encrypt01.py +++ b/test/suite/test_encrypt01.py @@ -66,41 +66,20 @@ class test_encrypt01(wttest.WiredTigerTestCase): nrecords = 5000 bigvalue = "abcdefghij" * 1001 # len(bigvalue) = 10010 - # Override WiredTigerTestCase, we have extensions. - def setUpConnectionOpen(self, dir): + def conn_extensions(self, extlist): + extlist.skip_if_missing = True + extlist.extension('encryptors', self.sys_encrypt) + extlist.extension('encryptors', self.file_encrypt) + extlist.extension('compressors', self.block_compress) + extlist.extension('compressors', self.log_compress) + + def conn_config(self): encarg = 'encryption=(name={0}{1}),'.format( self.sys_encrypt, self.sys_encrypt_args) comparg = '' if self.log_compress != None: comparg='log=(compressor={0}),'.format(self.log_compress) - extarg = self.extensionArg([('encryptors', self.sys_encrypt), - ('encryptors', self.file_encrypt), - ('compressors', self.block_compress), - ('compressors', self.log_compress)]) - conn = self.wiredtiger_open(dir, - 'create,error_prefix="{0}: ",{1}{2}{3}'.format( - self.shortid(), encarg, comparg, extarg)) - self.pr(`conn`) - return conn - - # Return the wiredtiger_open extension argument for a shared library. - def extensionArg(self, exts): - extfiles = [] - for ext in exts: - (dirname, name) = ext - if name != None and name != 'none': - testdir = os.path.dirname(__file__) - extdir = os.path.join(run.wt_builddir, 'ext', dirname) - extfile = os.path.join( - extdir, name, '.libs', 'libwiredtiger_' + name + '.so') - if not os.path.exists(extfile): - self.skipTest('extension "' + extfile + '" not built') - if not extfile in extfiles: - extfiles.append(extfile) - if len(extfiles) == 0: - return '' - else: - return ',extensions=["' + '","'.join(extfiles) + '"]' + return encarg + comparg # Create a table, add keys with both big and small values, then verify them. def test_encrypt(self): |