From e712ffa26c7d46cc2ef83f4816016bc68cd51a3a Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 3 Sep 2013 08:57:51 -0400 Subject: 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 --- .../TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenshiGenerator.py') 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) -- cgit v1.2.3-1-g7c22