Merge lp:~hloeung/charm-helpers/rsync-stderrors into lp:charm-helpers

[Haw Loeung]

Update rsync() to catch and report rsync errors. Current output below isn't very helpful:

| 2016-11-11 13:50:57 WARNING juju-log rsync failed(23): b''

Also add option to run rsync via 'timeout'.

[lp:~hloeung/charm-helpers/rsync-stderrors]

666. By Haw Loeung on 2016-12-12

core/host: Update rsync() adding option to specify how long rsync should run before it times out.

667. By Haw Loeung on 2016-12-13

[trivial] Fixed TypeError: sequence item 1: expected str instance, int found.

668. By Haw Loeung on 2016-12-13

Fixed stderr output of check_output().

[Stuart Bishop (stub)]

Fine. There is a failing tests, but it is trivial for me to fix.

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2016-11-09 11:15:25 +0000
+++ charmhelpers/core/host.py	2016-12-13 06:23:23 +0000
@@ -306,15 +306,17 @@
     subprocess.check_call(cmd)
 
 
-def rsync(from_path, to_path, flags='-r', options=None):
+def rsync(from_path, to_path, flags='-r', options=None, timeout=None):
     """Replicate the contents of a path"""
     options = options or ['--delete', '--executability']
     cmd = ['/usr/bin/rsync', flags]
+    if timeout:
+        cmd = ['timeout', str(timeout)] + cmd
     cmd.extend(options)
     cmd.append(from_path)
     cmd.append(to_path)
     log(" ".join(cmd))
-    return subprocess.check_output(cmd).decode('UTF-8').strip()
+    return subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode('UTF-8').strip()
 
 
 def symlink(source, destination):