Merge lp:~gnuoy/charm-helpers/user-exists-fstab-mount into lp:charm-helpers

[Liam Young]

[Chris Glass (tribaal)]

Looks good! +1

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2015-08-04 15:01:57 +0000
+++ charmhelpers/core/host.py	2015-08-17 11:40:14 +0000
@@ -148,6 +148,16 @@
     return user_info
 
 
+def user_exists(username):
+    """Check if a user exists"""
+    try:
+        pwd.getpwnam(username)
+        user_exists = True
+    except KeyError:
+        user_exists = False
+    return user_exists
+
+
 def add_group(group_name, system_group=False):
     """Add a group to the system"""
     try:
@@ -280,6 +290,17 @@
     return system_mounts
 
 
+def fstab_mount(mountpoint):
+    """Mount filesystem using fstab"""
+    cmd_args = ['mount', mountpoint]
+    try:
+        subprocess.check_output(cmd_args)
+    except subprocess.CalledProcessError as e:
+        log('Error unmounting {}\n{}'.format(mountpoint, e.output))
+        return False
+    return True
+
+
 def file_hash(path, hash_type='md5'):
     """
     Generate a hash checksum of the contents of 'path' or None if not found.

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2015-08-04 15:01:57 +0000
+++ tests/core/test_host.py	2015-08-17 11:40:14 +0000
@@ -303,6 +303,16 @@
         ])
         getpwnam.assert_called_with(username)
 
+    @patch('pwd.getpwnam')
+    def test_user_exists_true(self, getpwnam):
+        getpwnam.side_effect = 'pw info'
+        self.assertTrue(host.user_exists('bob'))
+
+    @patch('pwd.getpwnam')
+    def test_user_exists_false(self, getpwnam):
+        getpwnam.side_effect = KeyError('user not found')
+        self.assertFalse(host.user_exists('bob'))
+
     @patch('subprocess.check_call')
     @patch.object(host, 'log')
     def test_adds_a_user_to_a_group(self, log, check_call):
@@ -666,6 +676,20 @@
         '/etc/missing.conf': None
     }
 
+    @patch('subprocess.check_output')
+    @patch.object(host, 'log')
+    def test_fstab_mount(self, log, check_output):
+        self.assertTrue(host.fstab_mount('/mnt/mymntpnt'))
+        check_output.assert_called_with(['mount', '/mnt/mymntpnt'])
+
+    @patch('subprocess.check_output')
+    @patch.object(host, 'log')
+    def test_fstab_mount_fail(self, log, check_output):
+        error = subprocess.CalledProcessError(123, 'mount it', 'Oops...')
+        check_output.side_effect = error
+        self.assertFalse(host.fstab_mount('/mnt/mymntpnt'))
+        check_output.assert_called_with(['mount', '/mnt/mymntpnt'])
+
     @patch('hashlib.md5')
     @patch('os.path.exists')
     def test_file_hash_exists(self, exists, md5):