Merge pull request #212 from brianhlin/retire-osg34

Retire 3.4; add 3.5 decorators

Author: brianhlin

files/test_sequence

@@ -10,7 +10,6 @@ test_140_lcmaps
 test_150_xrootd
 test_155_stashcache
 test_158_xrootd_tpc
-test_160_rsv
 test_170_pbs
 test_180_cvmfs
 test_190_condorce
@@ -28,7 +27,6 @@ test_430_uberftp
 test_450_xrootd
 test_460_stashcache
 test_465_xrootd_tpc
-test_470_rsv
 test_490_jobs
 test_550_condorce
 test_580_gfal2util
@@ -38,7 +36,6 @@ test_770_myproxy
 test_780_voms
 test_790_condorce
 test_820_cvmfs
-test_830_rsv
 test_835_stashcache
 test_838_xrootd_tpc
 test_840_xrootd

osgtest/library/core.py

@@ -45,7 +45,7 @@
 # prefix each key with "COMP.", where "COMP" is a short lowercase string that
 # indicates which component the test belongs to, or "general." for truly cross-
 # cutting objects.
-state = {}
+state = {'proxy.valid': False}  # TODO: Drop 'proxy.valid' after we drop support for OSG 3.5
 
 class DummyClass(object):
     """A class that ignores all function calls; useful for testing"""
@@ -751,7 +751,7 @@ class TestFoo(osgunittest.OSGTestCase):
             def test_bar_34_only(self):
                 ...
     """
-    releases = map(str, releases)  # convert float args to str
+    releases = [str(x) for x in releases]  # convert float args to str
     def osg_release_decorator(fn):
         def run_fn_if_osg_release_ok(*args, **kwargs):
             if osg_release().version in releases:

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_160_rsv.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_220_myproxy.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_280_gsiopenssh.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_400_proxy.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')