Drop emi-trustmanager & voms-admin bits from tomcat

Author: matyasselmeci

osgtest/tests/test_240_tomcat.py

@@ -8,12 +8,6 @@
 
 class TestStartTomcat(osgunittest.OSGTestCase):
 
-    def test_01_config_trustmanager(self):
-        core.skip_ok_unless_installed(tomcat.pkgname(), 'emi-trustmanager-tomcat')
-
-        command = ('/var/lib/trustmanager-tomcat/configure.sh',)
-        core.check_system(command, 'Config trustmanager')
-
     def test_02_config_tomcat(self):
         core.skip_ok_unless_installed(tomcat.pkgname())
 

osgtest/tests/test_760_tomcat.py

@@ -14,12 +14,6 @@ def test_01_stop_tomcat(self):
         self.skip_bad_unless(core.state['tomcat.started'], 'Tomcat not started')
         service.check_stop(tomcat.pkgname())
 
-    def test_02_remove_vo_webapp(self):
-        core.skip_ok_unless_installed('voms-admin-server')
-        self.skip_ok_unless(core.state['voms.installed-vo-webapp'], 'did not start webapp')
-        # TODO: use check_stop after SOFTWARE-2514 is released
-        service.stop('voms-admin')
-
     def test_03_deconfig_tomcat_properties(self):
         core.skip_ok_unless_installed(tomcat.pkgname(), 'gratia-service')
         files.restore(os.path.join(tomcat.sysconfdir(), 'server.xml'), 'gratia')
@@ -33,32 +27,6 @@ def test_05_deconfig_context(self):
         self.skip_ok_if(core.options.nightly, 'Allow persistence in the nightlies')
         files.restore(tomcat.contextfile(), 'tomcat')
 
-    def test_06_remove_trustmanager(self):
-        core.skip_ok_unless_installed(tomcat.pkgname(), 'emi-trustmanager-tomcat')
-
-        # mv -f /etc/tomcat5/server.xml.old-trustmanager /etc/tomcat5/server.xml
-        old_tm = os.path.join(tomcat.sysconfdir(), 'server.xml.old-trustmanager')
-        new_tm = os.path.join(tomcat.sysconfdir(), 'server.xml')
-        if os.path.exists(old_tm) and os.path.isdir(os.path.dirname(new_tm)):
-            shutil.move(old_tm, new_tm)
-
-        # rm -f /usr/share/tomcat5/server/lib/bcprov*.jar
-        files.remove(os.path.join(tomcat.serverlibdir(), 'bcprov*.jar'))
-
-        # rm -f /usr/share/tomcat5/server/lib/log4j*.jar
-        files.remove(os.path.join(tomcat.serverlibdir(), 'log4j*.jar'))
-
-        # rm -f /usr/share/tomcat5/server/lib/trustmanager-*.jar
-        files.remove(os.path.join(tomcat.serverlibdir(), 'trustmanager-*.jar'))
-
-        # rm -f /etc/tomcat5/log4j-trustmanager.properties
-        files.remove(os.path.join(tomcat.sysconfdir(), 'log4j-trustmanager.properties'))
-
-        # rm -f /var/lib/trustmanager-tomcat/server.xml
-        files.remove('/var/lib/trustmanager-tomcat/server.xml')
-
-        core.log_message('EMI trustmanager removed')
-    
     def test_07_deconfig_tomcat(self):
         core.skip_ok_unless_installed(tomcat.pkgname())