Merge pull request #136 from brianhlin/fix-fetch-crl-errors

Fix fetch crl errors

Author: matyasselmeci

osgtest/tests/test_06_fetch_crl.py

@@ -7,8 +7,10 @@
 import osgtest.library.core as core
 import osgtest.library.osgunittest as osgunittest
 
-class TestFetchCrl(osgunittest.OSGTestCase):
-
+def output_is_acceptable(fetch_crl_output):
+    """All lines output from fetch-crl are considered an error. We whitelist
+    a few transient ones.
+    """
     error_message_whitelist = [
         'CRL has lastUpdate time in the future',
         'CRL has nextUpdate time in the past',
@@ -28,18 +30,23 @@ class TestFetchCrl(osgunittest.OSGTestCase):
         'LWP::Protocol::http::Socket',
     ]
 
-    def output_is_acceptable(self, fetch_crl_output):
-        all_lines_ok = True
-        for line in fetch_crl_output.rstrip('\n').split('\n'):
-            line_ok = False
-            for error_string in TestFetchCrl.error_message_whitelist:
-                if re.search(error_string, line):
-                    line_ok = True
-                    break
-            if not line_ok:
-                all_lines_ok = False
+    all_lines_ok = True
+    for line in fetch_crl_output.rstrip('\n').split('\n'):
+        if not line:  # skip blank lines
+            continue
+        line_ok = False
+        for error_string in error_message_whitelist:
+            if re.search(error_string, line):
+                line_ok = True
                 break
-        return all_lines_ok
+        if not line_ok:
+            all_lines_ok = False
+            core.log_message("Found uncaught error message: '%s'" % line.strip())
+            break
+    return all_lines_ok
+
+
+class TestFetchCrl(osgunittest.OSGTestCase):
 
     def test_01_fetch_crl(self):
         core.skip_ok_unless_installed('fetch-crl')
@@ -51,7 +58,7 @@ def test_01_fetch_crl(self):
         status, stdout, stderr = core.system(command)
         fail = core.diagnose('Run %s in /etc' % 'fetch-crl', command, status, stdout, stderr)
         if status == 1:
-            self.assert_(self.output_is_acceptable(stdout), fail)
+            self.assert_(output_is_acceptable(stdout), fail)
         else:
             self.assertEquals(status, 0, fail)
         count = len(glob.glob(os.path.join('/etc/grid-security/certificates', '*.r[0-9]')))
@@ -68,7 +75,7 @@ def test_02_fetch_crl_dir(self):
         status, stdout, stderr = core.system(command)
         fail = core.diagnose('Run fetch-crl in temp dir', command, status, stdout, stderr)
         if status == 1:
-            self.assert_(self.output_is_acceptable(stdout), fail)
+            self.assert_(output_is_acceptable(stdout), fail)
         else:
             self.assertEquals(status, 0, fail)
         count = len(glob.glob(os.path.join(temp_crl_dir, '*.r[0-9]')))