From 554bded7058a21abc5b5ea1afb09f0c2825d2c76 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 18 Jan 2013 13:21:24 -0500 Subject: testsuite: fixed test for encrypted Properties w/o crypto libraries installed --- .../Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py index d66780a20..cb15ff641 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py @@ -250,14 +250,6 @@ class TestXMLPropertyFile(TestPropertyFile, TestStructFile): pf.xdata = lxml.etree.Element("Properties") lxml.etree.SubElement(pf.xdata, "Crypted", encrypted="foo") pf.data = lxml.etree.tostring(pf.xdata) - # extra test: crypto is not available, but properties file is - # encrypted - has_crypto = Bcfg2.Server.Plugins.Properties.HAS_CRYPTO - Bcfg2.Server.Plugins.Properties.HAS_CRYPTO = False - try: - self.assertRaises(PluginExecutionError, pf.Index) - finally: - Bcfg2.Server.Plugins.Properties.HAS_CRYPTO = has_crypto @skipUnless(HAS_CRYPTO, "No crypto libraries found, skipping") def test_Index_crypto(self): -- cgit v1.2.3-1-g7c22