svn commit: samba r26450 - in branches/SAMBA_4_0: .
source/scripting/python/subunit
jelmer at samba.org
jelmer at samba.org
Fri Dec 14 01:53:55 GMT 2007
Author: jelmer
Date: 2007-12-14 01:53:54 +0000 (Fri, 14 Dec 2007)
New Revision: 26450
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26450
Log:
The subprocess is only available in python >= 2.4 so avoid it for now.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/scripting/python/subunit/__init__.py
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/scripting/python/subunit/__init__.py
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/subunit/__init__.py 2007-12-14 01:46:25 UTC (rev 26449)
+++ branches/SAMBA_4_0/source/scripting/python/subunit/__init__.py 2007-12-14 01:53:54 UTC (rev 26450)
@@ -20,7 +20,6 @@
import os
from StringIO import StringIO
-import subprocess
import sys
import unittest
@@ -315,9 +314,8 @@
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):
More information about the samba-cvs
mailing list