Remove code duplication and improve style.

tests/scm_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for scm.py."""
 
 from shutil import rmtree
 import tempfile
 
@@ skipping 10 matching lines @@
       fn(*args, **kwargs)
     except scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
 
 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')
 
 
 class RootTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'GetCasedPath', 'GenFakeDiff', 'GIT', 'SVN', 'ValidateEmail',
         'cStringIO', 'gclient_utils', 'glob', 'os', 're', 'shutil',
@@ skipping 247 matching lines @@
 <commit revision="14633">
 <author>nsylvain@chromium.org</author>
 <date>2009-04-27T19:37:17.977400Z</date>
 </commit>
 </wc-status>
 </entry>
 </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('.')
     expected = [
       ('?      ', 'unversionned_file.txt'),
       ('M      ', 'build\\internal\\essential.vsprops'),
       ('A  +   ', 'chrome\\app\\d'),
       ('MM     ', 'chrome\\app\\DEPS'),
       ('C      ', 'scripts\\master\\factory\\gclient_factory.py'),
     ]
     self.assertEquals(sorted(info), sorted(expected))
 
   def testRun(self):
     param2 = 'bleh'
     scm.gclient_utils.SubprocessCall(['svn', 'foo', 'bar'],
                                      param2).AndReturn(None)
     self.mox.ReplayAll()
     scm.SVN.Run(['foo', 'bar'], param2)
 
   def testCaptureStatusEmpty(self):
     text = r"""<?xml version="1.0"?>
     <status>
     <target
        path="perf">
        </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)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: