From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 26 Oct 2012 22:14:42 +0000 (-0800)
Subject: selftesthelpers: Simplify detection of tap2subunit. (cherry picked from commit 05dc5a... 
X-Git-Tag: samba-4.0.0rc4~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2008f379c299bd7dcdadec5620c276715cdfe95f;p=thirdparty%2Fsamba.git

selftesthelpers: Simplify detection of tap2subunit. (cherry picked from commit 05dc5a39a6ad4b1ffafc904faea3e8e40f6f5cde)
---

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index ff5bbd7f1f6..00fa8aae7c8 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -64,15 +64,17 @@ else:
 
 python = os.getenv("PYTHON", "python")
 
-#Set a default value, overridden if we find a working one on the system
+# Set a default value, overridden if we find a working one on the system
 tap2subunit = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools %s %s/lib/subunit/filters/tap2subunit" % (srcdir(), srcdir(), python, srcdir())
 
-sub = subprocess.Popen("tap2subunit 2> /dev/null", stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
+sub = subprocess.Popen("tap2subunit", stdin=subprocess.PIPE,
+    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 sub.communicate("")
 
 if sub.returncode == 0:
-    cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit 2> /dev/null | grep skip"
-    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit | grep skip"
+    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
+        stderr=subprocess.PIPE, shell=True)
     if sub.returncode == 0:
         tap2subunit = "tap2subunit"