Merge lp:~billy-olsen/charm-helpers/1662591-add_owner into lp:charm-helpers

[Billy Olsen]

[Jorge Niedbalski (niedbalski)]

LGTM, thanks for your contribution Billy!

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2017-02-07 02:37:22 +0000
+++ charmhelpers/core/host.py	2017-02-09 22:20:55 +0000
@@ -849,6 +849,20 @@
     chownr(path, owner, group, follow_links=False)
 
 
+def owner(path):
+    """Returns a tuple containing the username & groupname owning the path.
+
+    :param str path: the string path to retrieve the ownership
+    :return tuple(str, str): A (username, groupname) tuple containing the
+                             name of the user and group owning the path.
+    :raises OSError: if the specified path does not exist
+    """
+    stat = os.stat(path)
+    username = pwd.getpwuid(stat.st_uid)[0]
+    groupname = grp.getgrgid(stat.st_gid)[0]
+    return username, groupname
+
+
 def get_total_ram():
     """The total amount of system RAM in bytes.
 

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2017-02-07 20:44:55 +0000
+++ tests/core/test_host.py	2017-02-09 22:20:55 +0000
@@ -1704,6 +1704,20 @@
         self.assertEqual(host.cmp_pkgrevno('python', '2.4'), 0)
         self.assertEqual(host.cmp_pkgrevno('python', '2.5'), -1)
 
+    @patch.object(host.os, 'stat')
+    @patch.object(host.pwd, 'getpwuid')
+    @patch.object(host.grp, 'getgrgid')
+    @patch('posix.stat_result')
+    def test_owner(self, stat_result_, getgrgid_, getpwuid_, stat_):
+        getgrgid_.return_value = ['testgrp']
+        getpwuid_.return_value = ['testuser']
+        stat_.return_value = stat_result_()
+
+        user, group = host.owner('/some/path')
+        stat_.assert_called_once_with('/some/path')
+        self.assertEqual('testuser', user)
+        self.assertEqual('testgrp', group)
+
     def test_get_total_ram(self):
         raw = dedent('''\
                      MemFree:          183868 kB