Redo of r56893 with fix to support python 2.5.

tests/scm_unittest.py

Index: tests/scm_unittest.py
diff --git a/tests/scm_unittest.py b/tests/scm_unittest.py
index d2acc04b9e637b99737474a17631c8679a08d2f5..ac1e340264efe1b9491c886983e90fc21c281b8b 100755
--- a/tests/scm_unittest.py
+++ b/tests/scm_unittest.py
@@ -28,6 +28,7 @@ class BaseTestCase(SuperMoxTestBase):
 class BaseSCMTestCase(BaseTestCase):
   def setUp(self):
     BaseTestCase.setUp(self)
+    self.mox.StubOutWithMock(scm.gclient_utils, 'Popen')
     self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCallAndFilter')
 
@@ -295,11 +296,10 @@ class SVNTestCase(BaseSCMTestCase):
 </status>
 """
     proc = self.mox.CreateMockAnything()
-    scm.subprocess.Popen(['svn', 'status', '--xml', '.'],
-                         cwd=None,
-                         shell=scm.sys.platform.startswith('win'),
-                         stderr=None,
-                         stdout=scm.subprocess.PIPE).AndReturn(proc)
+    scm.gclient_utils.Popen(['svn', 'status', '--xml', '.'],
+                            cwd=None,
+                            stderr=None,
+                            stdout=scm.subprocess.PIPE).AndReturn(proc)
     proc.communicate().AndReturn((text, 0))
 
     self.mox.ReplayAll()
@@ -328,11 +328,10 @@ class SVNTestCase(BaseSCMTestCase):
        </target>
        </status>"""
     proc = self.mox.CreateMockAnything()
-    scm.subprocess.Popen(['svn', 'status', '--xml'],
-                         cwd=None,
-                         shell=scm.sys.platform.startswith('win'),
-                         stderr=None,
-                         stdout=scm.subprocess.PIPE).AndReturn(proc)
+    scm.gclient_utils.Popen(['svn', 'status', '--xml'],
+                            cwd=None,
+                            stderr=None,
+                            stdout=scm.subprocess.PIPE).AndReturn(proc)
     proc.communicate().AndReturn((text, 0))
     self.mox.ReplayAll()
     info = scm.SVN.CaptureStatus(None)