r26450: The subprocess is only available in python >= 2.4 so avoid it for now.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 14 Dec 2007 00:53:54 +0000 (01:53 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 04:50:15 +0000 (05:50 +0100)
(This used to be commit 5300bc175ea425e2d28332c5e18bd8e3846b458d)

source4/scripting/python/subunit/__init__.py

index e44dd766cc5a3ca35672a4f39b76b91ea39fd647..4f24803e63b8aaeced8898ac537ea3deda9bef53 100644 (file)
@@ -20,7 +20,6 @@
 
 import os
 from StringIO import StringIO
-import subprocess
 import sys
 import unittest
 
@@ -315,9 +314,8 @@ class ExecTestCase(unittest.TestCase):
 
     def _run(self, result):
         protocol = TestProtocolServer(result)
-        output = subprocess.Popen([self.script],
-                                  stdout=subprocess.PIPE).communicate()[0]
-        protocol.readFrom(StringIO(output))
+        output = os.popen(self.script, mode='r')
+        protocol.readFrom(output)
 
 
 class IsolatedTestCase(unittest.TestCase):