Add OSG 3.5 decorators

Author: brianhlin

osgtest/tests/test_130_gridftp.py

@@ -4,6 +4,10 @@
 
 class TestStartGridFTP(osgunittest.OSGTestCase):
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_start_gridftp(self):
         core.state['gridftp.started-server'] = False
         core.state['gridftp.running-server'] = False

osgtest/tests/test_140_lcmaps.py

@@ -6,6 +6,10 @@ class TestLcMaps(osgunittest.OSGTestCase):
 
     required_rpms = ['lcmaps', 'lcmaps-db-templates', 'vo-client', 'vo-client-lcmaps-voms']
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_configure(self):
         core.config['lcmaps.db'] = '/etc/lcmaps.db'
         core.config['lcmaps.gsi-authz'] = '/etc/grid-security/gsi-authz.conf'

osgtest/tests/test_150_xrootd.py

@@ -102,6 +102,7 @@ def test_01_configure_xrootd(self):
 
         core.state['xrootd.backups-exist'] = True
 
+    @core.osgrelease(3.5)
     def test_02_configure_hdfs(self):
         core.skip_ok_unless_installed('xrootd-hdfs')
         hdfs_config = "ofs.osslib /usr/lib64/libXrdHdfs.so"

osgtest/tests/test_220_myproxy.py

@@ -7,6 +7,10 @@
 
 class TestStartMyProxy(osgunittest.OSGTestCase):
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_config_certs(self):
         core.config['certs.myproxycert'] = '/etc/grid-security/myproxy/hostcert.pem'
         core.config['certs.myproxykey'] = '/etc/grid-security/myproxy/hostkey.pem'

osgtest/tests/test_280_gsiopenssh.py

@@ -26,6 +26,7 @@
 
 
 class TestStartGSIOpenSSH(osgunittest.OSGTestCase):
+    @core.osgrelease('3.5')
     def setUp(self):
         core.skip_ok_unless_installed('gsi-openssh-server', 'gsi-openssh-clients')
 

osgtest/tests/test_400_proxy.py

@@ -5,6 +5,10 @@
 
 class TestGridProxyInit(osgunittest.OSGTestCase):
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_remove_proxy(self):
         core.skip_ok_unless_installed('globus-proxy-utils')
         # If there is no pre-existing proxy file, the following command will

osgtest/tests/test_403_myproxy.py

@@ -5,6 +5,10 @@
 
 class TestMyProxy(osgunittest.OSGTestCase):
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_remove_proxy(self):
         core.skip_ok_unless_installed('myproxy', 'myproxy-server')
         self.skip_ok_unless(core.state['myproxy.started-server'], 'MyProxy server failed to start')

osgtest/tests/test_420_gridftp.py

@@ -9,6 +9,10 @@ class TestGridFTP(osgunittest.OSGTestCase):
 
     __data_path = '/usr/share/osg-test/test_gridftp_data.txt'
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_copy_local_to_server(self):
         core.skip_ok_unless_installed('globus-gridftp-server-progs', 'globus-ftp-client',
                                       'globus-proxy-utils', 'globus-gass-copy-progs')

osgtest/tests/test_430_uberftp.py

@@ -12,6 +12,10 @@ class TestUberFTP(osgunittest.OSGTestCase):
                      'globus-proxy-utils', 'globus-gass-copy-progs',
                      'uberftp']
 
+    @core.osgrelease(3.5)
+    def setUp(self):
+        pass
+
     def test_01_copy_local_to_server_uberftp(self):
         core.skip_ok_unless_installed(*self.required_rpms)
         self.skip_bad_unless(core.state['gridftp.running-server'] is True, 'GridFTP not running')

osgtest/tests/test_590_gsiopenssh.py

@@ -18,6 +18,7 @@ class TestGSIOpenSSH(osgunittest.OSGTestCase):
     local_path = None
     port = None
 
+    @core.osgrelease('3.5')
     def setUp(self):
         core.skip_ok_unless_installed('gsi-openssh-server', 'gsi-openssh-clients')
         self.skip_ok_unless(core.state['gsisshd.can-run'], "Couldn't run gsisshd (see above)")