Merge lp:~corey.bryant/charm-helpers/adduser-home-dir into lp:charm-helpers

[Corey Bryant]

[James Page (james-page)]

Change to module looks good, but please add a unit test to cover this as well.

review: Needs Fixing

[lp:~corey.bryant/charm-helpers/adduser-home-dir]

601. By Corey Bryant on 2016-07-08

Add test for adduser with --home

[Corey Bryant (corey.bryant)]

Thanks for the review. I've added a unit test for adduser with --home.

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/core/host.py	2016-07-08 12:59:26 +0000
@@ -174,7 +174,7 @@
 
 
 def adduser(username, password=None, shell='/bin/bash', system_user=False,
-            primary_group=None, secondary_groups=None, uid=None):
+            primary_group=None, secondary_groups=None, uid=None, home_dir=None):
     """Add a user to the system.
 
     Will log but otherwise succeed if the user already exists.
@@ -186,6 +186,7 @@
     :param str primary_group: Primary group for user; defaults to username
     :param list secondary_groups: Optional list of additional groups
     :param int uid: UID for user being created
+    :param str home_dir: Home directory for user
 
     :returns: The password database entry struct, as returned by `pwd.getpwnam`
     """
@@ -200,6 +201,8 @@
         cmd = ['useradd']
         if uid:
             cmd.extend(['--uid', str(uid)])
+        if home_dir:
+            cmd.extend(['--home', str(home_dir)])
         if system_user or password is None:
             cmd.append('--system')
         else:

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2016-05-31 20:23:32 +0000
+++ tests/core/test_host.py	2016-07-08 12:59:26 +0000
@@ -642,6 +642,29 @@
         getpwnam.assert_called_with(username)
 
     @patch('pwd.getpwnam')
+    @patch('subprocess.check_call')
+    @patch.object(host, 'log')
+    def test_adds_a_systemuser_with_home_dir(self, log, check_call, getpwnam):
+        username = 'johndoe'
+        existing_user_pwnam = KeyError('user not found')
+        new_user_pwnam = 'some user pwnam'
+
+        getpwnam.side_effect = [existing_user_pwnam, new_user_pwnam]
+
+        result = host.adduser(username, system_user=True,
+                              home_dir='/var/lib/johndoe')
+
+        self.assertEqual(result, new_user_pwnam)
+        check_call.assert_called_with([
+            'useradd',
+            '--home',
+            '/var/lib/johndoe',
+            '--system',
+            username
+        ])
+        getpwnam.assert_called_with(username)
+
+    @patch('pwd.getpwnam')
     @patch('pwd.getpwuid')
     @patch('grp.getgrnam')
     @patch('subprocess.check_call')