"exclude" gratia tests on el7+ instead of okskipping them

Author: matyasselmeci

osgtest/tests/test_230_gratia.py

@@ -8,8 +8,9 @@
 
 class TestStartGratia(osgunittest.OSGTestCase):
 
+    @core.elrelease(6)
     def setUp(self):
-        self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7")
+        pass
 
     def patternreplace(self, infile_name, pattern, full_line):
         """This helper method loops through the passed in infile line by line.
@@ -168,13 +169,3 @@ def test_09_config_user_vo_map(self):
             files.write(core.config['gratia.user-vo-map'],
                         conFileContents,
                         owner='root')
-
-    def test_10_fix_tomcat_template(self):
-        # Fix EL7 bug in Gratia template
-        if core.el_release() == 7:
-            core.skip_ok_unless_installed(tomcat.pkgname(), 'gratia-service')
-            core.config['gratia.broken_template'] = '/usr/share/gratia/server.xml.template'
-            bad_line = r'\s+sSLImplementation=.*'
-            fixed_line = ' '*15 + 'sslImplementationName="org.glite.security.trustmanager.tomcat.TMSSLImplementation"'
-            files.replace_regexpr(core.config['gratia.broken_template'], bad_line, fixed_line, owner='gratia')
-

osgtest/tests/test_540_gratia.py

@@ -7,8 +7,9 @@
 
 class TestGratia(osgunittest.OSGTestCase):
 
+    @core.elrelease(6)
     def setUp(self):
-        self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7")
+        pass
 
     def patternreplace(self, infile_name, pattern, full_line, insert_after=False):
         """This method is taken from test_28 - we can consider moving it to core.py module

osgtest/tests/test_800_gratia.py

@@ -3,12 +3,12 @@
 import osgtest.library.core as core
 import osgtest.library.files as files
 import osgtest.library.osgunittest as osgunittest
-import osgtest.library.tomcat as tomcat
 
 class TestStopGratia(osgunittest.OSGTestCase):
 
+    @core.elrelease(6)
     def setUp(self):
-        self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7")
+        pass
 
     #This test removes the http certificates, if not already removed earlier
     def test_01_remove_certs(self):
@@ -153,8 +153,3 @@ def test_12_restore_user_vo_map_file(self):
         core.skip_ok_unless_installed('gratia-service')
         if files.filesBackedup(core.config['gratia.user-vo-map'], 'root'):
             files.restore(core.config['gratia.user-vo-map'], 'root')
-
-    def test_13_restore_tomcat_template(self):
-        if core.el_release() == 7:
-            core.skip_ok_unless_installed(tomcat.pkgname(), 'gratia-service')
-            files.restore(core.config['gratia.broken_template'], 'gratia')