Commit 5a180bb8 authored by maruel@chromium.org's avatar maruel@chromium.org

Implement fixes requested in review http://codereview.chromium.org/215039

TBR=nsylvain
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/216044

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26806 0039d316-1c4b-4281-b951-d872f2087c98
parent c13c5ff5
...@@ -1092,8 +1092,8 @@ class SCMWrapperTestCase(GClientBaseTestCase): ...@@ -1092,8 +1092,8 @@ class SCMWrapperTestCase(GClientBaseTestCase):
base_path = os.path.join(self.root_dir, self.relpath) base_path = os.path.join(self.root_dir, self.relpath)
gclient.os.path.isdir(base_path).AndReturn(True) gclient.os.path.isdir(base_path).AndReturn(True)
gclient_scm.CaptureSVNStatus(base_path).AndReturn([]) gclient_scm.CaptureSVNStatus(base_path).AndReturn([])
gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path, gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'],
mox.IgnoreArg()) base_path, mox.IgnoreArg())
self.mox.ReplayAll() self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
...@@ -1118,8 +1118,8 @@ class SCMWrapperTestCase(GClientBaseTestCase): ...@@ -1118,8 +1118,8 @@ class SCMWrapperTestCase(GClientBaseTestCase):
gclient_scm.os.path.exists(file_path2).AndReturn(True) gclient_scm.os.path.exists(file_path2).AndReturn(True)
gclient_scm.os.path.isfile(file_path2).AndReturn(True) gclient_scm.os.path.isfile(file_path2).AndReturn(True)
gclient_scm.os.remove(file_path2) gclient_scm.os.remove(file_path2)
gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path, gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'],
mox.IgnoreArg()) base_path, mox.IgnoreArg())
print(os.path.join(base_path, 'a')) print(os.path.join(base_path, 'a'))
print(os.path.join(base_path, 'b')) print(os.path.join(base_path, 'b'))
...@@ -1142,7 +1142,6 @@ class SCMWrapperTestCase(GClientBaseTestCase): ...@@ -1142,7 +1142,6 @@ class SCMWrapperTestCase(GClientBaseTestCase):
gclient_scm.os.path.exists(file_path).AndReturn(True) gclient_scm.os.path.exists(file_path).AndReturn(True)
gclient_scm.os.path.isfile(file_path).AndReturn(False) gclient_scm.os.path.isfile(file_path).AndReturn(False)
gclient_scm.os.path.isdir(file_path).AndReturn(True) gclient_scm.os.path.isdir(file_path).AndReturn(True)
#gclient_scm.os.remove(file_path)
gclient_utils.RemoveDirectory(file_path) gclient_utils.RemoveDirectory(file_path)
file_list1 = [] file_list1 = []
gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path, gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment