X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=blobdiff_plain;f=buptest.py;h=7c7cc2f37f1d04f13b5094edf285ee382dc1f823;hp=5d4fe05029643f9ba7049f479ed52e2b4f794039;hb=57aaebfd07e7f35aed2ebd44191669b1d9db49df;hpb=c40b3dd5fd74e72024fbaad3daf5a958aefa1c54

diff --git a/buptest.py b/buptest.py
index 5d4fe05..7c7cc2f 100644
--- a/buptest.py
+++ b/buptest.py
@@ -2,15 +2,17 @@
 from __future__ import absolute_import, print_function
 from collections import namedtuple
 from contextlib import contextmanager
-from os.path import basename, dirname, realpath
+from os.path import abspath, basename, dirname, realpath
 from pipes import quote
-from subprocess import PIPE, Popen, check_call
+from subprocess import PIPE, Popen
 from traceback import extract_stack
-import subprocess, sys, tempfile
+import errno, os, subprocess, sys, tempfile
 
 from wvtest import WVPASSEQ, wvfailure_count
 
 from bup import helpers
+from bup.compat import str_type
+from bup.io import byte_stream
 
 
 @contextmanager
@@ -33,8 +35,12 @@ def no_lingering_errors():
 
 
 # Assumes (of course) this file is at the top-level of the source tree
-_bup_tmp = realpath(dirname(__file__) + '/t/tmp')
-helpers.mkdirp(_bup_tmp)
+_bup_tmp = realpath(dirname(__file__.encode('iso-8859-1')) + b'/t/tmp')
+try:
+    os.makedirs(_bup_tmp)
+except OSError as e:
+    if e.errno != errno.EEXIST:
+        raise
 
 
 @contextmanager
@@ -47,41 +53,53 @@ def test_tempdir(prefix):
         subprocess.call(['rm', '-rf', tmpdir])
 
 
-def logcmd(cmd):
-    if isinstance(cmd, basestring):
-        print(cmd, file=sys.stderr)
-    else:
-        print(' '.join(map(quote, cmd)), file=sys.stderr)
-
+ex_res = namedtuple('SubprocResult', ['out', 'err', 'proc', 'rc'])
 
-SubprocInfo = namedtuple('SubprocInfo', ('out', 'err', 'rc', 'p'))
-
-def exo(cmd, input=None, stdin=None, stdout=PIPE, stderr=PIPE,
-        shell=False, check=True):
-    """Print cmd to stderr, run it, and return the resulting SubprocInfo.
-    The keyword arguments are passed to Popen, and the defaults
-    capture both stdout and stderr.
+def run(cmd, check=True, input=None, **kwargs):
+    """Run a subprocess as per subprocess.Popen(cmd, **kwargs) followed by
+    communicate(input=input).  If check is true, then throw an
+    exception if the subprocess exits with non-zero status.  Return a
+    SubprocResult tuple.
 
     """
-    logcmd(cmd)
-    p = Popen(cmd,
-              stdin=(PIPE if input else stdin),
-              stdout=stdout,
-              stderr=stderr,
-              shell=shell)
+    if input:
+        assert 'stdin' not in kwargs
+        kwargs['stdin'] = PIPE
+    p = Popen(cmd, **kwargs)
     out, err = p.communicate(input=input)
     if check and p.returncode != 0:
         raise Exception('subprocess %r failed with status %d%s'
-                        % (' '.join(map(quote, cmd)),
-                           p.returncode,
-                           (', stderr: %r' % err) if stderr else ''))
-    return SubprocInfo(out=out, err=err, rc=p.returncode, p=p)
+                        % (cmd, p.returncode,
+                           (', stderr: %r' % err) if err else ''))
+    return ex_res(out=out, err=err, proc=p, rc=p.returncode)
+
+def logcmd(cmd):
+    s = helpers.shstr(cmd)
+    if isinstance(cmd, str_type):
+        print(s, file=sys.stderr)
+    else:
+        # bytes - for now just continue to pass it through given
+        # bup-python wrapper
+        print(s.decode('iso-8859-1'), file=sys.stderr)
+
+def ex(cmd, **kwargs):
+    """Print cmd to stderr and then run it as per ex(...).
+    Print the subprocess stderr to stderr if stderr=PIPE and there's
+    any data.
+    """
+    logcmd(cmd)
+    result = run(cmd, **kwargs)
+    if result.err:
+        sys.stderr.flush()
+        byte_stream(sys.stderr).write(result.err)
+    return result
 
-def exc(cmd, input=None, stdout=None, stderr=None, shell=False, check=True):
-    """Print cmd to stderr, run it, and return the resulting SubprocInfo.
-    The keyword arguments are passed to Popen, and the defaults
-    allow stdout and stderr to pass through.
+def exo(cmd, **kwargs):
+    """Print cmd to stderr and then run it as per ex(..., stdout=PIPE).
+    Print the subprocess stderr to stderr if stderr=PIPE and there's
+    any data.
 
     """
-    return exo(cmd, input=input, stdout=stdout, stderr=stderr, shell=shell,
-               check=check)
+    assert 'stdout' not in kwargs
+    kwargs['stdout'] = PIPE
+    return ex(cmd, **kwargs)