Merge pull request #179 from brianhlin/SOFTWARE-3783.no-rsv-osg35

Exclude RSV tests on OSG 3.5 (SOFTWARE-3783)

Author: brianhlin

osgtest/tests/test_160_rsv.py

@@ -2,8 +2,13 @@
 
 from osgtest.library import core, service, osgunittest
 
+
 class TestStartRSV(osgunittest.OSGTestCase):
 
+    @core.osgrelease(3.4)
+    def setUp(self):
+        pass
+
     def test_01_config(self):
         pass
 

osgtest/tests/test_470_rsv.py

@@ -26,6 +26,10 @@ class TestRSV(osgunittest.OSGTestCase):
 
     host = socket.getfqdn()
 
+    @core.osgrelease(3.4)
+    def setUp(self):
+        pass
+
     def start_rsv(self):
         core.check_system(('rsv-control', '--on'), 'rsv-control --on')
 
@@ -203,16 +207,12 @@ def test_031_hostcert_expiry_metric(self):
 
         self.run_metric('org.osg.local.hostcert-expiry')
 
-    # OSG 3.3 tries to download from IU and causes a failure
-    @core.osgrelease(3.4)
     def test_032_cacert_expiry(self):
         core.skip_ok_unless_installed('rsv', 'htcondor-ce')
 
         self.run_metric('org.osg.certificates.cacert-expiry',
                         accept_status=['OK', 'WARNING'])
 
-    # OSG 3.3 tries to download from IU and causes a failure
-    @core.osgrelease(3.4)
     def test_033_crlcert_expiry(self):
         core.skip_ok_unless_installed('rsv', 'htcondor-ce')
 

osgtest/tests/test_830_rsv.py

@@ -3,8 +3,13 @@
 import osgtest.library.service as service
 import osgtest.library.osgunittest as osgunittest
 
+
 class TestStopRSV(osgunittest.OSGTestCase):
 
+    @core.osgrelease(3.4)
+    def setUp(self):
+        pass
+
     def test_01_stop_rsv(self):
         core.skip_ok_unless_installed('rsv')
         self.skip_ok_if(core.state['rsv.started-service'] == False, 'did not start service')

travis-ci/rsv.packages

@@ -0,0 +1 @@
+rsv