Merge pull request #150 from matyasselmeci/wip/fixcerttest

Catch OSError in core.check_file_and_perms()

Author: matyasselmeci

osgtest/library/core.py

@@ -647,16 +647,19 @@ def check_file_ownership(file_path, owner_name):
         file_stat = os.stat(file_path)
         return (file_stat.st_uid == owner_uid.pw_uid and
                 stat.S_ISREG(file_stat.st_mode))
-    except OSError:  # file does not exist                                                                                                                                                          
+    except OSError:  # file does not exist
         return False
 
 def check_file_and_perms(file_path, owner_name, permissions):
     """Return True if the file at 'file_path' exists, is owned by
     'owner_name', is a file, and has the given permissions; False otherwise
     """
-    file_stat = os.stat(file_path)
-    return (check_file_ownership(file_path, owner_name) and 
-               file_stat.st_mode & 0o7777 == permissions)
+    try:
+        file_stat = os.stat(file_path)
+        return (check_file_ownership(file_path, owner_name) and
+                file_stat.st_mode & 0o7777 == permissions)
+    except OSError:  # file does not exist
+        return False
 
 def parse_env_output(output):
     """