summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc/Testlib/TestEncryption.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-17 09:20:37 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-17 09:20:37 -0500
commitae58c24f72a8ed72327fbc3f7305bd69ec6a13db (patch)
treee8614b54239161156d76424251cfc868643488a0 /testsuite/Testsrc/Testlib/TestEncryption.py
parent873a373c7eda0ba523ea8b78c3c45d7e8f189628 (diff)
downloadbcfg2-ae58c24f72a8ed72327fbc3f7305bd69ec6a13db.tar.gz
bcfg2-ae58c24f72a8ed72327fbc3f7305bd69ec6a13db.tar.bz2
bcfg2-ae58c24f72a8ed72327fbc3f7305bd69ec6a13db.zip
Made a few encryption things simpler:
* Only one strict/lax setting, in [encryption], rather than separate settings in [properties] and [sshkeys] * No longer necessary to enable encryption on each Properties file
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestEncryption.py')
-rw-r--r--testsuite/Testsrc/Testlib/TestEncryption.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/testsuite/Testsrc/Testlib/TestEncryption.py b/testsuite/Testsrc/Testlib/TestEncryption.py
index 778d5b963..c03aa66e1 100644
--- a/testsuite/Testsrc/Testlib/TestEncryption.py
+++ b/testsuite/Testsrc/Testlib/TestEncryption.py
@@ -193,11 +193,6 @@ baz
# test that different algorithms are used
mock_passphrases.reset_mock()
- self.assertRaises(EVPError,
- bruteforce_decrypt,
- crypted, setup=setup, algorithm=self.algo)
-
- mock_passphrases.reset_mock()
crypted = ssl_encrypt(self.plaintext, passwd, algorithm=self.algo)
self.assertEqual(self.plaintext,
bruteforce_decrypt(crypted, setup=setup,