Don't discard stderr.

R=maruel@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/14643009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@197419 0039d316-1c4b-4281-b951-d872f2087c98

subprocess2.py

@@ -355,7 +355,6 @@ class Popen(subprocess.Popen):
     self._tee_threads(input)
     if stdout is not None:
       stdout = ''.join(stdout)
-    stderr = None
     if stderr is not None:
       stderr = ''.join(stderr)
     return (stdout, stderr)

tests/subprocess2_test.py

@@ -326,6 +326,14 @@ class RegressionTest(BaseTestCase):
       self._check_res(res, None, None, 0)
     self._run_test(fn)
 
+  def test_stderr(self):
+    cmd = ['expr', '1', '/', '0']
+    p1 = subprocess.Popen(cmd, stderr=subprocess.PIPE)
+    p2 = subprocess2.Popen(cmd, stderr=subprocess.PIPE)
+    r1 = p1.communicate()
+    r2 = p2.communicate(timeout=100)
+    self.assertEquals(r1, r2)
+
 
 class S2Test(BaseTestCase):
   # Tests that can only run in subprocess2, e.g. new functionalities.