Refactor SubprocessCallAndFilter() to remove positional arguments.

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 298 matching lines @@
       ('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)
+                                     cwd=param2).AndReturn(None)
     self.mox.ReplayAll()
-    scm.SVN.Run(['foo', 'bar'], param2)
+    scm.SVN.Run(['foo', 'bar'], cwd=param2)
 
   def testCaptureStatusEmpty(self):
     text = r"""<?xml version="1.0"?>
     <status>
     <target
        path="perf">
        </target>
        </status>"""
     proc = self.mox.CreateMockAnything()
     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: