From b971b5e27bf20e66912c9bc5baa4a2399859e257 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 25 Apr 2018 10:58:23 -0500 Subject: [PATCH] Disable Gratia tests on EL7 --- osgtest/tests/test_23_gratia.py | 3 +++ osgtest/tests/test_54_gratia.py | 3 +++ osgtest/tests/test_80_gratia.py | 3 +++ 3 files changed, 9 insertions(+) diff --git a/osgtest/tests/test_23_gratia.py b/osgtest/tests/test_23_gratia.py index d7ad95af..afade3bc 100644 --- a/osgtest/tests/test_23_gratia.py +++ b/osgtest/tests/test_23_gratia.py @@ -8,6 +8,9 @@ class TestStartGratia(osgunittest.OSGTestCase): + def setUp(self): + self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7") + def patternreplace(self, infile_name, pattern, full_line): """This helper method loops through the passed in infile line by line. If it finds the passed in pattern, it replaces the whole line with diff --git a/osgtest/tests/test_54_gratia.py b/osgtest/tests/test_54_gratia.py index 031254cd..f93a8e7d 100644 --- a/osgtest/tests/test_54_gratia.py +++ b/osgtest/tests/test_54_gratia.py @@ -7,6 +7,9 @@ class TestGratia(osgunittest.OSGTestCase): + def setUp(self): + self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7") + 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 This helper method loops through the passed in infile line by line. diff --git a/osgtest/tests/test_80_gratia.py b/osgtest/tests/test_80_gratia.py index d90c6664..b84ff72d 100644 --- a/osgtest/tests/test_80_gratia.py +++ b/osgtest/tests/test_80_gratia.py @@ -7,6 +7,9 @@ class TestStopGratia(osgunittest.OSGTestCase): + def setUp(self): + self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7") + #This test removes the http certificates, if not already removed earlier def test_01_remove_certs(self):