_helpers: fix module init, and get it at least building with py3

[bup.git] / buptest.py

diff --git a/buptest.py b/buptest.py
index 78e5bb9a83d8b9114e2e84eff1192cf2396c7a07..14ca1c388e58c1a3d7bc967fa1ec812109445d22 100644 (file)
--- a/buptest.py
+++ b/buptest.py
@@ -1,6 +1,10 @@
 
+from __future__ import print_function
+from collections import namedtuple
 from contextlib import contextmanager
 from os.path import basename, dirname, realpath
+from pipes import quote
+from subprocess import PIPE, Popen, check_call
 from traceback import extract_stack
 import subprocess, sys, tempfile
 
@@ -16,10 +20,10 @@ def no_lingering_errors():
             bt = extract_stack()
             src_file, src_line, src_func, src_txt = bt[-4]
             msg = 'saved_errors ' + repr(helpers.saved_errors)
-            print '! %-70s %s' % ('%s:%-4d %s' % (basename(src_file),
+            print('! %-70s %s' % ('%s:%-4d %s' % (basename(src_file),
                                                   src_line,
                                                   msg),
-                                  'FAILED')
+                                  'FAILED'))
             sys.stdout.flush()
     fail_if_errors()
     helpers.clear_errors()
@@ -41,3 +45,43 @@ def test_tempdir(prefix):
     if wvfailure_count() == initial_failures:
         subprocess.call(['chmod', '-R', 'u+rwX', tmpdir])
         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)
+
+
+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.
+
+    """
+    logcmd(cmd)
+    p = Popen(cmd,
+              stdin=(PIPE if input else stdin),
+              stdout=stdout,
+              stderr=stderr,
+              shell=shell)
+    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)
+
+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.
+
+    """
+    return exo(cmd, input=input, stdout=stdout, stderr=stderr, shell=shell,
+               check=check)