mirror of
https://github.com/samba-team/samba.git
synced 2025-11-20 08:23:50 +03:00
r26450: The subprocess is only available in python >= 2.4 so avoid it for now.
This commit is contained in:
committed by
Stefan Metzmacher
parent
d3643c2152
commit
5300bc175e
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user