summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-14 01:53:54 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:15 +0100
commit4a33ca21943f72ddde4b22ddd6591c2ccdbb657b (patch)
tree5a51db21c7581026ba94403dbd514462d4abe6ea /source4/scripting
parentbf6d40f271682e87224102afd0855cee8916202e (diff)
downloadsamba-4a33ca21943f72ddde4b22ddd6591c2ccdbb657b.tar.gz
samba-4a33ca21943f72ddde4b22ddd6591c2ccdbb657b.tar.bz2
samba-4a33ca21943f72ddde4b22ddd6591c2ccdbb657b.zip
r26450: The subprocess is only available in python >= 2.4 so avoid it for now.
(This used to be commit 5300bc175ea425e2d28332c5e18bd8e3846b458d)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/subunit/__init__.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index e44dd766cc..4f24803e63 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -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):