Merge lp:~gnuoy/charm-helpers/minor-additions into lp:charm-helpers

[Liam Young]

Added a system_user option to add_user and a trivial apt_update function

[lp:~gnuoy/charm-helpers/minor-additions]

23. By Liam Young on 2013-06-10

Add tests for apt_update and creating a system user

24. By Liam Young on 2013-06-10

Remove apt_update code as gandelman-a already has a super/faster/stronger mp for this

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2013-05-30 11:02:07 +0000
+++ charmhelpers/core/host.py	2013-06-10 16:02:28 +0000
@@ -33,7 +33,7 @@
     return False
 
 
-def adduser(username, password, shell='/bin/bash'):
+def adduser(username, password=None, shell='/bin/bash', system_user=False):
     """Add a user"""
     # TODO: generate a password if none is given
     try:
@@ -41,13 +41,16 @@
         log('user {0} already exists!'.format(username))
     except KeyError:
         log('creating user {0}'.format(username))
-        cmd = [
-            'useradd',
-            '--create-home',
-            '--shell', shell,
-            '--password', password,
-            username
-        ]
+        cmd = ['useradd']
+        if system_user or password is None:
+           cmd.append('--system')
+        else: 
+           cmd.extend([
+               '--create-home',
+               '--shell', shell,
+               '--password', password,
+           ])
+        cmd.append(username)
         subprocess.check_call(cmd)
         user_info = pwd.getpwnam(username)
     return user_info

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2013-05-31 10:16:36 +0000
+++ tests/core/test_host.py	2013-06-10 16:02:28 +0000
@@ -183,6 +183,26 @@
         ])
         getpwnam.assert_called_with(username)
 
+    @patch('pwd.getpwnam')
+    @patch('subprocess.check_call')
+    @patch.object(host, 'log')
+    def test_adds_a_systemuser(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)
+
+        self.assertEqual(result, new_user_pwnam)
+        check_call.assert_called_with([
+            'useradd',
+            '--system',
+            username
+        ])
+        getpwnam.assert_called_with(username)
+
     @patch('subprocess.check_call')
     @patch.object(host, 'log')
     def test_adds_a_user_to_a_group(self, log, check_call):