Commit 91655502 authored by ukai@chromium.org's avatar ukai@chromium.org

Fix git_cl_test.py on Windows

R=maruel@chromium.org
BUG=none
TEST=python.exe git_cl_test.py

Review URL: https://chromiumcodereview.appspot.com/10442028

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138964 0039d316-1c4b-4281-b951-d872f2087c98
parent ea2c99ae
...@@ -411,13 +411,15 @@ class TestGitCl(TestCase): ...@@ -411,13 +411,15 @@ class TestGitCl(TestCase):
ParseCodereviewSettingsContent) ParseCodereviewSettingsContent)
self.mock(git_cl.os, 'access', self._mocked_call) self.mock(git_cl.os, 'access', self._mocked_call)
self.mock(git_cl.os, 'chmod', self._mocked_call) self.mock(git_cl.os, 'chmod', self._mocked_call)
src_dir = os.path.join(os.path.sep, 'usr', 'local', 'src')
def AbsPath(path): def AbsPath(path):
if not path.startswith('/'): if not path.startswith(os.path.sep):
return os.path.join('/usr/local/src', path) return os.path.join(src_dir, path)
return path return path
self.mock(git_cl.os.path, 'abspath', AbsPath) self.mock(git_cl.os.path, 'abspath', AbsPath)
commit_msg_path = os.path.join(src_dir, '.git', 'hooks', 'commit-msg')
def Exists(path): def Exists(path):
if path == '/usr/local/src/.git/hooks/commit-msg': if path == commit_msg_path:
return False return False
# others paths, such as /usr/share/locale/.... # others paths, such as /usr/share/locale/....
return True return True
...@@ -434,11 +436,10 @@ class TestGitCl(TestCase): ...@@ -434,11 +436,10 @@ class TestGitCl(TestCase):
((['git', 'config', 'gerrit.host'],), 'gerrit.chromium.org'), ((['git', 'config', 'gerrit.host'],), 'gerrit.chromium.org'),
((['git', 'config', 'rietveld.server'],), 'gerrit.chromium.org'), ((['git', 'config', 'rietveld.server'],), 'gerrit.chromium.org'),
((['git', 'rev-parse', '--show-cdup'],), ''), ((['git', 'rev-parse', '--show-cdup'],), ''),
(('/usr/local/src/.git/hooks/commit-msg', os.X_OK,), False), ((commit_msg_path, os.X_OK,), False),
(('https://gerrit.chromium.org/tools/hooks/commit-msg', (('https://gerrit.chromium.org/tools/hooks/commit-msg',
'/usr/local/src/.git/hooks/commit-msg',), ''), commit_msg_path,), ''),
(('/usr/local/src/.git/hooks/commit-msg', ((commit_msg_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR,), ''),
stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR,), ''),
# GetCodereviewSettingsInteractively # GetCodereviewSettingsInteractively
((['git', 'config', 'rietveld.server'],), 'gerrit.chromium.org'), ((['git', 'config', 'rietveld.server'],), 'gerrit.chromium.org'),
(('Rietveld server (host[:port]) [https://gerrit.chromium.org]:',), (('Rietveld server (host[:port]) [https://gerrit.chromium.org]:',),
...@@ -450,7 +451,7 @@ class TestGitCl(TestCase): ...@@ -450,7 +451,7 @@ class TestGitCl(TestCase):
((['git', 'config', 'rietveld.viewvc-url'],), ''), ((['git', 'config', 'rietveld.viewvc-url'],), ''),
(('ViewVC URL:',), ''), (('ViewVC URL:',), ''),
# DownloadHooks(True) # DownloadHooks(True)
(('/usr/local/src/.git/hooks/commit-msg', os.X_OK,), True), ((commit_msg_path, os.X_OK,), True),
] ]
git_cl.main(['config']) git_cl.main(['config'])
......
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