Rev 5264: Merge sftp-leaks into catch-them-all in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5264 [merge]
revision-id: v.ladeuil+lp at free.fr-20100610172308-w4eco88456iouogr
parent: v.ladeuil+lp at free.fr-20100610170918-uo063229g1nqqlbf
parent: v.ladeuil+lp at free.fr-20100610172306-dpvp18fdne1jom9j
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: catch-them-all
timestamp: Thu 2010-06-10 19:23:08 +0200
message:
  Merge sftp-leaks into catch-them-all
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-06-05 16:31:07 +0000
+++ b/bzrlib/tests/__init__.py	2010-06-10 17:23:08 +0000
@@ -3322,11 +3322,11 @@
                 '--subunit']
             if '--no-plugins' in sys.argv:
                 argv.append('--no-plugins')
-            # stderr=subrocess.STDOUT would be ideal, but until we prevent
+            # stderr=subprocess.STDOUT would be ideal, but until we prevent
             # noise on stderr it can interrupt the subunit protocol.
-            process = subrocess.Popen(argv, stdin=subrocess.PIPE,
-                                      stdout=subrocess.PIPE,
-                                      stderr=subrocess.PIPE,
+            process = subprocess.Popen(argv, stdin=subprocess.PIPE,
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.PIPE,
                                       bufsize=1)
             test = TestInSubprocess(process, test_list_file_name)
             result.append(test)