Adding function to check ownership

Author: efajardo

osgtest/library/core.py

@@ -634,19 +634,25 @@ def get_hostname():
     except socket.error:
         return None
 
+def check_file_ownership(file_path, owner_name):
+    """Return True if at 'file_path' exists, is owned by
+    'owner_name' and is a  is a file
+    """
+    owner_uid = pwd.getpwnam(owner_name)
+    try:
+        file_stat = os.stat(file_path)
+        return (file_stat.st_uid == owner_uid and
+                stat.S_ISREG(file_stat.st_mode))
+    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
-         """
-        owner_uid = pwd.getpwnam(owner_name)
-        try:
-            file_stat = os.stat(file_path)
-            return (file_stat.st_uid == owner_uid and
-                    file_stat.st_mode & 0o7777 == permissions and
-                    stat.S_ISREG(file_stat.st_mode))
-        except OSError:  # file does not exist
-            return False
+    """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
 
 def parse_env_output(output):
     """