diff options
| author | Gordon Messmer <gordon@dragonsdawn.net> | 2014-09-11 15:15:57 -0700 |
|---|---|---|
| committer | Gordon Messmer <gordon@dragonsdawn.net> | 2014-09-11 15:15:57 -0700 |
| commit | 9c12d602514ce6479bdaa1f541f7f7b30d27bd8d (patch) | |
| tree | 1d41633b6ef11183c237b136f75890306e2c1678 /testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py | |
| parent | 52e561fc1e51a82dafb27f0327bcbabbb02e0ec0 (diff) | |
| download | bcfg2-9c12d602514ce6479bdaa1f541f7f7b30d27bd8d.tar.gz bcfg2-9c12d602514ce6479bdaa1f541f7f7b30d27bd8d.tar.bz2 bcfg2-9c12d602514ce6479bdaa1f541f7f7b30d27bd8d.zip | |
Fix tests to match changes to the Jinja2 code.
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py index 281ecb2e7..6857f933b 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py @@ -30,18 +30,17 @@ except ImportError: HAS_CRYPTO = False -if can_skip or (HAS_CRYPTO and HAS_JINJA2): - class TestCfgEncryptedJinja2Generator(TestCfgJinja2Generator, - TestCfgEncryptedGenerator): - test_obj = CfgEncryptedJinja2Generator +class TestCfgEncryptedJinja2Generator(TestCfgJinja2Generator, + TestCfgEncryptedGenerator): + test_obj = CfgEncryptedJinja2Generator - @skipUnless(HAS_CRYPTO, "Encryption libraries not found, skipping") - @skipUnless(HAS_JINJA2, "Jinja2 libraries not found, skipping") - def setUp(self): - pass + @skipUnless(HAS_CRYPTO, "Encryption libraries not found, skipping") + @skipUnless(HAS_JINJA2, "Jinja2 libraries not found, skipping") + def setUp(self): + pass - def test_handle_event(self): - TestCfgEncryptedGenerator.test_handle_event(self) + def test_handle_event(self): + TestCfgEncryptedGenerator.test_handle_event(self) - def test_get_data(self): - TestCfgJinja2Generator.test_get_data(self) + def test_get_data(self): + TestCfgJinja2Generator.test_get_data(self) |