diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-03 08:57:51 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-03 08:57:53 -0400 |
| commit | e712ffa26c7d46cc2ef83f4816016bc68cd51a3a (patch) | |
| tree | 164204cc8a9534b8fba9048954b5ef88aeed4728 /testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py | |
| parent | c21167209f26a62fc509a4f5798cb9e2acb15405 (diff) | |
| download | bcfg2-e712ffa26c7d46cc2ef83f4816016bc68cd51a3a.tar.gz bcfg2-e712ffa26c7d46cc2ef83f4816016bc68cd51a3a.tar.bz2 bcfg2-e712ffa26c7d46cc2ef83f4816016bc68cd51a3a.zip | |
testsuite: removed obsolete can_skip variable
This was needed when we implemented skipping ourselves in a hackish
way; with unittest2, skipping is implemented correctly, so tests can
always be skipped
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py index 25d2fb83b..0b74e4a60 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py @@ -18,10 +18,9 @@ from TestServer.TestPlugins.TestCfg.TestCfgGenshiGenerator import \ TestCfgGenshiGenerator -if can_skip or HAS_CRYPTO: - class TestCfgEncryptedGenshiGenerator(TestCfgGenshiGenerator): - test_obj = CfgEncryptedGenshiGenerator +class TestCfgEncryptedGenshiGenerator(TestCfgGenshiGenerator): + test_obj = CfgEncryptedGenshiGenerator - @skipUnless(HAS_CRYPTO, "Encryption libraries not found, skipping") - def setUp(self): - TestCfgGenshiGenerator.setUp(self) + @skipUnless(HAS_CRYPTO, "Encryption libraries not found, skipping") + def setUp(self): + TestCfgGenshiGenerator.setUp(self) |