From 6e0883f3692392123680274f69d27b202939a9ad Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Sun, 24 Jun 2018 18:30:16 +0000
Subject: [PATCH] issue #275: tests: fix bug in 2.6 compat check_output(),
 ignore it for >2.6.

---
 tests/testlib.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/testlib.py b/tests/testlib.py
index ae2d5504..46868f6d 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -41,9 +41,12 @@ def subprocess__check_output(*popenargs, **kwargs):
         cmd = kwargs.get("args")
         if cmd is None:
             cmd = popenargs[0]
-        raise subprocess.CalledProcessError(retcode, cmd, output=output)
+        raise subprocess.CalledProcessError(retcode, cmd)
     return output
 
+if hasattr(subprocess, 'check_output'):
+    subprocess__check_output = subprocess.check_output
+
 
 def wait_for_port(
         host,