maruel@chromium.org | 45d8db0 | 2011-03-31 20:43:56 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
steveblock@chromium.org | 9356704 | 2012-02-15 01:02:26 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 5 | |
| 6 | """Unit tests for gclient_scm.py.""" |
| 7 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 8 | # pylint: disable=E1103 |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 9 | |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 10 | # Import before super_mox to keep valid references. |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 11 | from shutil import rmtree |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 12 | from subprocess import Popen, PIPE, STDOUT |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 13 | |
| 14 | import logging |
| 15 | import os |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 16 | import re |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 17 | import sys |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 18 | import tempfile |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 19 | import unittest |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 20 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 21 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 22 | |
maruel@chromium.org | 0927b7e | 2011-11-11 16:06:22 +0000 | [diff] [blame] | 23 | from testing_support.super_mox import mox, StdoutCheck, SuperMoxTestBase |
| 24 | from testing_support.super_mox import TestCaseUtils |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 25 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 26 | import gclient_scm |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 27 | import git_cache |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 28 | import subprocess2 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 29 | |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 30 | # Disable global git cache |
| 31 | git_cache.Mirror.SetCachePath(None) |
| 32 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 33 | # Shortcut since this function is used often |
| 34 | join = gclient_scm.os.path.join |
| 35 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 36 | TIMESTAMP_RE = re.compile('\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL) |
| 37 | def strip_timestamps(value): |
| 38 | lines = value.splitlines(True) |
| 39 | for i in xrange(len(lines)): |
| 40 | m = TIMESTAMP_RE.match(lines[i]) |
| 41 | if m: |
| 42 | lines[i] = m.group(1) |
| 43 | return ''.join(lines) |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 44 | |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 45 | # Access to a protected member XXX of a client class |
| 46 | # pylint: disable=W0212 |
| 47 | |
| 48 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 49 | class GCBaseTestCase(object): |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 50 | def assertRaisesError(self, msg, fn, *args, **kwargs): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 51 | """Like unittest's assertRaises() but checks for Gclient.Error.""" |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 52 | # pylint: disable=E1101 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 53 | try: |
| 54 | fn(*args, **kwargs) |
| 55 | except gclient_scm.gclient_utils.Error, e: |
| 56 | self.assertEquals(e.args[0], msg) |
| 57 | else: |
| 58 | self.fail('%s not raised' % msg) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 59 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 60 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 61 | class BaseTestCase(GCBaseTestCase, SuperMoxTestBase): |
| 62 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 63 | SuperMoxTestBase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 64 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter') |
| 65 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, |
| 66 | 'CheckCallAndFilterAndHeader') |
| 67 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead') |
| 68 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite') |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 69 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'rmtree') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 70 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 71 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, '_CaptureInfo') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 72 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus') |
| 73 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList') |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 74 | self.mox.StubOutWithMock(subprocess2, 'communicate') |
| 75 | self.mox.StubOutWithMock(subprocess2, 'Popen') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 76 | self._scm_wrapper = gclient_scm.CreateSCM |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 77 | gclient_scm.scm.SVN.current_version = None |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 78 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 79 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 80 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
| 81 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 82 | # Absolute path of the fake checkout directory. |
| 83 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 84 | |
| 85 | def tearDown(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 86 | SuperMoxTestBase.tearDown(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 87 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 88 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 89 | |
| 90 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 91 | class SVNWrapperTestCase(BaseTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 92 | class OptionsObject(object): |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 93 | def __init__(self, verbose=False, revision=None, force=False): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 94 | self.verbose = verbose |
| 95 | self.revision = revision |
| 96 | self.manually_grab_svn_rev = True |
| 97 | self.deps_os = None |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 98 | self.force = force |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 99 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 100 | self.nohooks = False |
maruel@chromium.org | 36ac239 | 2011-10-12 16:36:11 +0000 | [diff] [blame] | 101 | # TODO(maruel): Test --jobs > 1. |
| 102 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 103 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 104 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 105 | def checkstdout(self, expected): |
| 106 | value = sys.stdout.getvalue() |
| 107 | sys.stdout.close() |
| 108 | # pylint: disable=E1101 |
| 109 | self.assertEquals(expected, strip_timestamps(value)) |
| 110 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 111 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 112 | return self.OptionsObject(*args, **kwargs) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 113 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 114 | def setUp(self): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 115 | BaseTestCase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 116 | self.url = self.SvnUrl() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 117 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 118 | def testUnsupportedSCM(self): |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 119 | args = ['gopher://foo', self.root_dir, self.relpath] |
| 120 | exception_msg = 'No SCM found for url gopher://foo' |
| 121 | self.assertRaisesError(exception_msg, self._scm_wrapper, *args) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 122 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 123 | def testSVNFullUrlForRelativeUrl(self): |
| 124 | self.url = 'svn://a/b/c/d' |
| 125 | |
| 126 | self.mox.ReplayAll() |
| 127 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 128 | relpath=self.relpath) |
| 129 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'svn://a/b/crap') |
| 130 | |
| 131 | def testGITFullUrlForRelativeUrl(self): |
| 132 | self.url = 'git://a/b/c/d' |
| 133 | |
| 134 | self.mox.ReplayAll() |
| 135 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 136 | relpath=self.relpath) |
| 137 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'git://a/b/c/crap') |
| 138 | |
igorgatis@gmail.com | 4e07567 | 2011-11-21 16:35:08 +0000 | [diff] [blame] | 139 | def testGITFakeHttpUrl(self): |
| 140 | self.url = 'git+http://foo' |
| 141 | |
| 142 | self.mox.ReplayAll() |
| 143 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 144 | relpath=self.relpath) |
| 145 | self.assertEqual(scm.url, 'http://foo') |
| 146 | |
| 147 | def testGITFakeHttpsUrl(self): |
| 148 | self.url = 'git+https://foo' |
| 149 | |
| 150 | self.mox.ReplayAll() |
| 151 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 152 | relpath=self.relpath) |
| 153 | self.assertEqual(scm.url, 'https://foo') |
| 154 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 155 | def testRunCommandException(self): |
| 156 | options = self.Options(verbose=False) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 157 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
mmoss@chromium.org | 50fd47f | 2014-02-13 01:03:19 +0000 | [diff] [blame] | 158 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 159 | self.mox.ReplayAll() |
| 160 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 161 | relpath=self.relpath) |
| 162 | exception = "Unsupported argument(s): %s" % ','.join(self.args) |
| 163 | self.assertRaisesError(exception, scm.RunCommand, |
| 164 | 'update', options, self.args) |
| 165 | |
| 166 | def testRunCommandUnknown(self): |
| 167 | # TODO(maruel): if ever used. |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 168 | pass |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 169 | |
| 170 | def testRevertMissing(self): |
| 171 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 172 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 173 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 174 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 175 | ).AndReturn('1.5.1') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 176 | # It'll to a checkout instead. |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 177 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 178 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 179 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 180 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 181 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 182 | gclient_scm.os.makedirs(parent) |
| 183 | gclient_scm.os.path.exists(parent).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 184 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 185 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 186 | options.verbose, |
| 187 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 188 | cwd=self.root_dir, |
| 189 | file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 190 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 191 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 192 | ).AndReturn({'Revision': 100}) |
| 193 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 194 | self.mox.ReplayAll() |
| 195 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 196 | relpath=self.relpath) |
| 197 | scm.revert(options, self.args, files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 198 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 199 | ('_____ %s is missing, synching instead\n' % self.relpath)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 200 | |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 201 | def testRevertNoDotSvn(self): |
| 202 | options = self.Options(verbose=True, force=True) |
| 203 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 204 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(False) |
mmoss@chromium.org | 50fd47f | 2014-02-13 01:03:19 +0000 | [diff] [blame] | 205 | gclient_scm.os.path.isdir(join(self.base_path, '.git')).AndReturn(False) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 206 | gclient_scm.os.path.isdir(join(self.base_path, '.hg')).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 207 | # Checkout. |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 208 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 209 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 210 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 211 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 212 | gclient_scm.os.makedirs(parent) |
| 213 | gclient_scm.os.path.exists(parent).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 214 | files_list = self.mox.CreateMockAnything() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 215 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 216 | ).AndReturn('1.6') |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 217 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 218 | options.verbose, |
| 219 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 220 | cwd=self.root_dir, |
| 221 | file_list=files_list) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 222 | gclient_scm.gclient_utils.rmtree(self.base_path) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 223 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 224 | ).AndReturn({'Revision': 100}) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 225 | self.mox.ReplayAll() |
| 226 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 227 | relpath=self.relpath) |
| 228 | scm.revert(options, self.args, files_list) |
| 229 | self.checkstdout( |
| 230 | '\n_____ %s is not a valid svn checkout, synching instead\n' % |
| 231 | self.relpath) |
| 232 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 233 | def testRevertNone(self): |
| 234 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 235 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 236 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 237 | gclient_scm.scm.SVN.CaptureStatus( |
| 238 | None, self.base_path, no_ignore=False).AndReturn([]) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 239 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 240 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 241 | options.verbose, |
| 242 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 243 | cwd=self.base_path, |
| 244 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 245 | |
| 246 | self.mox.ReplayAll() |
| 247 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 248 | relpath=self.relpath) |
| 249 | file_list = [] |
| 250 | scm.revert(options, self.args, file_list) |
| 251 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 252 | def testRevertDirectory(self): |
| 253 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 254 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 255 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 256 | items = [ |
| 257 | ('~ ', 'a'), |
| 258 | ] |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 259 | gclient_scm.scm.SVN.CaptureStatus( |
| 260 | None, self.base_path, no_ignore=False).AndReturn(items) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 261 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 262 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 263 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
msb@chromium.org | 32906d1 | 2010-01-12 18:22:09 +0000 | [diff] [blame] | 264 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 265 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 266 | gclient_scm.gclient_utils.rmtree(file_path) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 267 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 268 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 269 | options.verbose, |
| 270 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 271 | cwd=self.base_path, |
| 272 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 273 | |
| 274 | self.mox.ReplayAll() |
| 275 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 276 | relpath=self.relpath) |
| 277 | file_list2 = [] |
| 278 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 279 | self.checkstdout(('%s\n' % file_path)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 280 | |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 281 | def testRevertDot(self): |
| 282 | self.mox.StubOutWithMock(gclient_scm.SVNWrapper, 'update') |
| 283 | options = self.Options(verbose=True) |
| 284 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 285 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
| 286 | items = [ |
| 287 | ('~ ', '.'), |
| 288 | ] |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 289 | gclient_scm.scm.SVN.CaptureStatus( |
| 290 | None, self.base_path, no_ignore=False).AndReturn(items) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 291 | # gclient_utils.rmtree() doesn't work on path ending with '.', like 'foo/.'. |
maruel@chromium.org | 6208757 | 2012-04-24 23:16:28 +0000 | [diff] [blame] | 292 | file_path = self.base_path |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 293 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 294 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
| 295 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
| 296 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 297 | gclient_scm.gclient_utils.rmtree(file_path) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 298 | # pylint: disable=E1120 |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 299 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 300 | gclient_scm.SVNWrapper.update(options, [], ['.']) |
| 301 | |
| 302 | self.mox.ReplayAll() |
| 303 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 304 | relpath=self.relpath) |
| 305 | file_list2 = [] |
| 306 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 6208757 | 2012-04-24 23:16:28 +0000 | [diff] [blame] | 307 | self.checkstdout(('%s\n' % os.path.join(file_path, '.'))) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 308 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 309 | def testStatus(self): |
| 310 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 311 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 312 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 313 | options.verbose, |
| 314 | ['status'] + self.args + ['--ignore-externals'], |
| 315 | cwd=self.base_path, |
| 316 | file_list=[]).AndReturn(None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 317 | |
| 318 | self.mox.ReplayAll() |
| 319 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 320 | relpath=self.relpath) |
| 321 | file_list = [] |
| 322 | self.assertEqual(scm.status(options, self.args, file_list), None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 323 | |
| 324 | # TODO(maruel): TEST REVISIONS!!! |
| 325 | # TODO(maruel): TEST RELOCATE!!! |
| 326 | def testUpdateCheckout(self): |
| 327 | options = self.Options(verbose=True) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 328 | file_info = gclient_scm.gclient_utils.PrintableObject() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 329 | file_info.root = 'blah' |
| 330 | file_info.url = self.url |
| 331 | file_info.uuid = 'ABC' |
| 332 | file_info.revision = 42 |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 333 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 334 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 335 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 336 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 337 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 338 | gclient_scm.os.makedirs(parent) |
| 339 | gclient_scm.os.path.exists(parent).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 340 | files_list = self.mox.CreateMockAnything() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 341 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 342 | ).AndReturn('1.5.1') |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 343 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 344 | options.verbose, |
| 345 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 346 | cwd=self.root_dir, |
| 347 | file_list=files_list) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 348 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 349 | ).AndReturn({'Revision': 100}) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 350 | self.mox.ReplayAll() |
| 351 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 352 | relpath=self.relpath) |
| 353 | scm.update(options, (), files_list) |
| 354 | |
| 355 | def testUpdateUpdate(self): |
| 356 | options = self.Options(verbose=True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 357 | options.force = True |
| 358 | options.nohooks = False |
| 359 | file_info = { |
| 360 | 'Repository Root': 'blah', |
| 361 | 'URL': self.url, |
| 362 | 'UUID': 'ABC', |
| 363 | 'Revision': 42, |
| 364 | } |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 365 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 366 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 367 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 368 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 369 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 370 | # Checkout or update. |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 371 | dotted_path = join(self.base_path, '.') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 372 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 373 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 374 | # Verify no locked files. |
| 375 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([]) |
| 376 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 377 | # Cheat a bit here. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 378 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 379 | ).AndReturn(file_info) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 380 | |
| 381 | # _AddAdditionalUpdateFlags() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 382 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 383 | ).AndReturn('1.5.1') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 384 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 385 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 386 | ).AndReturn({'Revision': 100}) |
| 387 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 388 | additional_args = [] |
| 389 | if options.manually_grab_svn_rev: |
| 390 | additional_args = ['--revision', str(file_info['Revision'])] |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 391 | additional_args.extend(['--force', '--ignore-externals']) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 392 | files_list = [] |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 393 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | 0380707 | 2010-08-16 17:18:44 +0000 | [diff] [blame] | 394 | options.verbose, |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 395 | ['update', self.base_path] + additional_args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 396 | cwd=self.root_dir, file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 397 | |
| 398 | self.mox.ReplayAll() |
| 399 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 400 | relpath=self.relpath) |
| 401 | scm.update(options, (), files_list) |
| 402 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 403 | def testUpdateReset(self): |
| 404 | options = self.Options(verbose=True) |
| 405 | options.reset = True |
| 406 | file_info = { |
| 407 | 'Repository Root': 'blah', |
| 408 | 'URL': self.url, |
| 409 | 'UUID': 'ABC', |
| 410 | 'Revision': 42, |
| 411 | } |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 412 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 413 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 414 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 415 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 416 | |
| 417 | # Checkout or update. |
| 418 | dotted_path = join(self.base_path, '.') |
| 419 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 420 | |
| 421 | # Create an untracked file and directory. |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 422 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path |
| 423 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 424 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 425 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 426 | ).AndReturn(file_info) |
| 427 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 428 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 429 | ).AndReturn({'Revision': 100}) |
| 430 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 431 | self.mox.ReplayAll() |
| 432 | files_list = [] |
| 433 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 434 | relpath=self.relpath) |
| 435 | scm.update(options, (), files_list) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 436 | self.checkstdout('_____ %s at 42\n' % self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 437 | |
| 438 | def testUpdateResetDeleteUnversionedTrees(self): |
| 439 | options = self.Options(verbose=True) |
| 440 | options.reset = True |
| 441 | options.delete_unversioned_trees = True |
| 442 | |
| 443 | file_info = { |
| 444 | 'Repository Root': 'blah', |
| 445 | 'URL': self.url, |
| 446 | 'UUID': 'ABC', |
| 447 | 'Revision': 42, |
| 448 | } |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 449 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 450 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 451 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 452 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 453 | |
| 454 | # Checkout or update. |
| 455 | dotted_path = join(self.base_path, '.') |
| 456 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 457 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 458 | # Create an untracked file and directory. |
| 459 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path |
| 460 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 461 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 462 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 463 | ).AndReturn(file_info) |
| 464 | |
| 465 | # Confirm that the untracked file is removed. |
| 466 | gclient_scm.scm.SVN.CaptureStatus(None, self.base_path |
| 467 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 468 | gclient_scm.os.path.isdir(join(self.base_path, 'dir')).AndReturn(True) |
| 469 | gclient_scm.os.path.isdir(join(self.base_path, 'file')).AndReturn(False) |
| 470 | gclient_scm.os.path.islink(join(self.base_path, 'dir')).AndReturn(False) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 471 | gclient_scm.gclient_utils.rmtree(join(self.base_path, 'dir')) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 472 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 473 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 474 | ).AndReturn({'Revision': 100}) |
| 475 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 476 | self.mox.ReplayAll() |
| 477 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 478 | relpath=self.relpath) |
| 479 | files_list = [] |
| 480 | scm.update(options, (), files_list) |
| 481 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 482 | ('_____ %s at 42\n' |
| 483 | '_____ removing unversioned directory dir\n') % self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 484 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 485 | def testUpdateSingleCheckout(self): |
| 486 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 487 | file_info = { |
| 488 | 'URL': self.url, |
| 489 | 'Revision': 42, |
| 490 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 491 | |
| 492 | # Checks to make sure that we support svn co --depth. |
| 493 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 494 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 495 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 496 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
| 497 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(False) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 498 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 499 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 500 | dotted_path = join(self.base_path, '.') |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 501 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 502 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 503 | # When checking out a single file, we issue an svn checkout and svn update. |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 504 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 505 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 506 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 507 | always=True, |
| 508 | cwd=self.root_dir) |
| 509 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 510 | options.verbose, |
| 511 | ['update', 'DEPS', '--ignore-externals'], |
| 512 | cwd=self.base_path, |
| 513 | file_list=files_list) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 514 | |
| 515 | # Now we fall back on scm.update(). |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 516 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 517 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 518 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 519 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 520 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 521 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 522 | ).AndReturn(file_info) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 523 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 524 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 525 | ).AndReturn({'Revision': 100}) |
| 526 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 527 | self.mox.ReplayAll() |
| 528 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 529 | relpath=self.relpath) |
| 530 | scm.updatesingle(options, ['DEPS'], files_list) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 531 | self.checkstdout('_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 532 | |
| 533 | def testUpdateSingleCheckoutSVN14(self): |
| 534 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 535 | |
| 536 | # Checks to make sure that we support svn co --depth. |
| 537 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 538 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 539 | ).AndReturn('1.4.4') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 540 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 541 | |
| 542 | # When checking out a single file with svn 1.4, we use svn export |
| 543 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 544 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 545 | ['svn', 'export', join(self.url, 'DEPS'), join(self.base_path, 'DEPS')], |
scottmg@chromium.org | f547c80 | 2013-09-27 17:55:26 +0000 | [diff] [blame] | 546 | always=True, cwd=self.root_dir) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 547 | |
| 548 | self.mox.ReplayAll() |
| 549 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 550 | relpath=self.relpath) |
| 551 | scm.updatesingle(options, ['DEPS'], files_list) |
| 552 | |
| 553 | def testUpdateSingleCheckoutSVNUpgrade(self): |
| 554 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 555 | file_info = { |
| 556 | 'URL': self.url, |
| 557 | 'Revision': 42, |
| 558 | } |
| 559 | |
| 560 | # Checks to make sure that we support svn co --depth. |
| 561 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 562 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 563 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 564 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 565 | # If DEPS already exists, assume we're upgrading from svn1.4, so delete |
| 566 | # the old DEPS file. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 567 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(True) |
| 568 | gclient_scm.os.remove(join(self.base_path, 'DEPS')) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 569 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 570 | # Verify no locked files. |
| 571 | gclient_scm.scm.SVN.CaptureStatus( |
| 572 | None, join(self.base_path, '.')).AndReturn([]) |
| 573 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 574 | # When checking out a single file, we issue an svn checkout and svn update. |
| 575 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 576 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 577 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 578 | always=True, |
| 579 | cwd=self.root_dir) |
| 580 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 581 | options.verbose, |
| 582 | ['update', 'DEPS', '--ignore-externals'], |
| 583 | cwd=self.base_path, |
| 584 | file_list=files_list) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 585 | |
| 586 | # Now we fall back on scm.update(). |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 587 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 588 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 589 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 590 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 591 | gclient_scm.scm.SVN._CaptureInfo( |
| 592 | [], join(self.base_path, ".")).AndReturn(file_info) |
| 593 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 594 | ).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 595 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 596 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 597 | ).AndReturn({'Revision': 100}) |
| 598 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 599 | self.mox.ReplayAll() |
| 600 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 601 | relpath=self.relpath) |
| 602 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 603 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 604 | ('_____ %s at 42\n' % self.relpath)) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 605 | |
| 606 | def testUpdateSingleUpdate(self): |
| 607 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 608 | file_info = { |
| 609 | 'URL': self.url, |
| 610 | 'Revision': 42, |
| 611 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 612 | # Checks to make sure that we support svn co --depth. |
| 613 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 614 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 615 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 616 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 617 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 618 | # Verify no locked files. |
| 619 | gclient_scm.scm.SVN.CaptureStatus(None, join(self.base_path, '.') |
| 620 | ).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 621 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 622 | # Now we fall back on scm.update(). |
| 623 | files_list = self.mox.CreateMockAnything() |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 624 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 625 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 626 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 627 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 628 | gclient_scm.scm.SVN._CaptureInfo( |
| 629 | [], join(self.base_path, '.')).AndReturn(file_info) |
| 630 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 631 | ).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 632 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 633 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 634 | ).AndReturn({'Revision': 100}) |
| 635 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 636 | self.mox.ReplayAll() |
| 637 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 638 | relpath=self.relpath) |
| 639 | scm.updatesingle(options, ['DEPS'], files_list) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 640 | self.checkstdout('_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 641 | |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 642 | def testUpdateGit(self): |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 643 | options = self.Options(verbose=True) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 644 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.hg') |
| 645 | gclient_scm.os.path.exists(file_path).AndReturn(False) |
| 646 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 647 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 648 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
| 649 | error = gclient_scm.subprocess2.CalledProcessError( |
| 650 | 1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 651 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.').AndRaise(error) |
| 652 | |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 653 | bad_scm_path = os.path.join(self.root_dir, '_bad_scm', |
| 654 | os.path.dirname(self.relpath)) |
| 655 | gclient_scm.os.makedirs(bad_scm_path) |
| 656 | dest_path = os.path.join(bad_scm_path, |
| 657 | os.path.basename(self.relpath) + 'ABCD') |
| 658 | self.mox.StubOutWithMock(gclient_scm.tempfile, 'mkdtemp', True) |
| 659 | gclient_scm.tempfile.mkdtemp( |
| 660 | prefix=os.path.basename(self.relpath), |
| 661 | dir=os.path.join(self.root_dir, '_bad_scm', |
| 662 | os.path.dirname(self.relpath))).AndReturn(dest_path) |
| 663 | self.mox.StubOutWithMock(gclient_scm.shutil, 'move', True) |
| 664 | gclient_scm.shutil.move(self.base_path, dest_path) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 665 | gclient_scm.os.path.exists(self.root_dir).AndReturn(True) |
| 666 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 667 | ).AndReturn('1.5.1') |
| 668 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 669 | options.verbose, |
| 670 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 671 | cwd=self.root_dir, |
| 672 | file_list=[]) |
| 673 | |
| 674 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 675 | ).AndReturn({'Revision': 100}) |
| 676 | |
| 677 | self.mox.ReplayAll() |
| 678 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 679 | relpath=self.relpath) |
| 680 | scm.update(options, None, []) |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 681 | self.checkstdout('_____ Conflicting directory found in %s. Moving to %s.\n' |
| 682 | % (self.base_path, dest_path)) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 683 | |
| 684 | def testUpdateGitForce(self): |
| 685 | options = self.Options(verbose=True, force=True) |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 686 | old_environ = dict(gclient_scm.os.environ) |
| 687 | gclient_scm.os.environ['CHROME_HEADLESS'] = '1' |
| 688 | try: |
| 689 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.hg') |
| 690 | gclient_scm.os.path.exists(file_path).AndReturn(False) |
| 691 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 692 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 693 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
| 694 | error = gclient_scm.subprocess2.CalledProcessError( |
| 695 | 1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 696 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.').AndRaise(error) |
| 697 | gclient_scm.gclient_utils.rmtree(self.base_path) |
| 698 | gclient_scm.os.path.exists(self.root_dir).AndReturn(True) |
| 699 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 700 | ).AndReturn('1.5.1') |
| 701 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 702 | options.verbose, |
| 703 | ['checkout', self.url, self.base_path, '--force', |
| 704 | '--ignore-externals'], |
| 705 | cwd=self.root_dir, |
| 706 | file_list=[]) |
primiano@chromium.org | 69177ea | 2014-08-05 23:19:29 +0000 | [diff] [blame^] | 707 | |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 708 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 709 | ).AndReturn({'Revision': 100}) |
primiano@chromium.org | 69177ea | 2014-08-05 23:19:29 +0000 | [diff] [blame^] | 710 | |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 711 | self.mox.ReplayAll() |
| 712 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 713 | relpath=self.relpath) |
| 714 | file_list = [] |
| 715 | scm.update(options, None, file_list) |
| 716 | self.checkstdout('_____ Conflicting directory found in %s. Removing.\n' |
| 717 | % self.base_path) |
| 718 | finally: |
| 719 | gclient_scm.os.environ = old_environ |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 720 | |
| 721 | def testUpdateGitSvn(self): |
| 722 | options = self.Options(verbose=True) |
| 723 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.hg') |
| 724 | gclient_scm.os.path.exists(file_path).AndReturn(False) |
| 725 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 726 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 727 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(True) |
| 728 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
| 729 | gclient_scm.scm.GIT.Capture(['config', '--local', '--get', |
| 730 | 'svn-remote.svn.url'], |
| 731 | cwd=self.base_path).AndReturn(self.url) |
| 732 | |
| 733 | self.mox.ReplayAll() |
| 734 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 735 | relpath=self.relpath) |
| 736 | file_list = [] |
| 737 | scm.update(options, [], file_list) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 738 | self.checkstdout( |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 739 | ('\n_____ %s looks like a git-svn checkout. Skipping.\n' % self.relpath) |
| 740 | ) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 741 | |
| 742 | def testUpdateHg(self): |
| 743 | options = self.Options(verbose=True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 744 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(True) |
| 745 | |
| 746 | self.mox.ReplayAll() |
| 747 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 748 | relpath=self.relpath) |
| 749 | file_list = [] |
| 750 | scm.update(options, self.args, file_list) |
| 751 | self.checkstdout( |
| 752 | ('________ found .hg directory; skipping %s\n' % self.relpath)) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 753 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 754 | def testGetUsableRevSVN(self): |
| 755 | # pylint: disable=E1101 |
| 756 | options = self.Options(verbose=True) |
| 757 | |
| 758 | # Mock SVN revision validity checking. |
| 759 | self.mox.StubOutWithMock( |
| 760 | gclient_scm.scm.SVN, 'IsValidRevision', True) |
| 761 | gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 1) |
| 762 | ).AndReturn(True) |
| 763 | gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 'fake') |
| 764 | ).AndReturn(False) |
| 765 | |
| 766 | self.mox.ReplayAll() |
| 767 | |
| 768 | svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir) |
| 769 | # With an SVN checkout, 1 an example of a valid usable rev. |
| 770 | self.assertEquals(svn_scm.GetUsableRev(1, options), 1) |
| 771 | # With an SVN checkout, a fake or unknown rev should raise an excpetion. |
| 772 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 773 | svn_scm.GetUsableRev, 'fake', options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 774 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 775 | class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils, |
| 776 | unittest.TestCase): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 777 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 778 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 779 | def __init__(self, verbose=False, revision=None): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 780 | self.verbose = verbose |
| 781 | self.revision = revision |
| 782 | self.manually_grab_svn_rev = True |
| 783 | self.deps_os = None |
| 784 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 785 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 786 | self.nohooks = False |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 787 | self.upstream = False |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 788 | self.cache_dir = None |
bauerb@chromium.org | 4dd0937 | 2011-07-22 14:41:51 +0000 | [diff] [blame] | 789 | self.merge = False |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 790 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 791 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 792 | |
| 793 | sample_git_import = """blob |
| 794 | mark :1 |
| 795 | data 6 |
| 796 | Hello |
| 797 | |
| 798 | blob |
| 799 | mark :2 |
| 800 | data 4 |
| 801 | Bye |
| 802 | |
| 803 | reset refs/heads/master |
| 804 | commit refs/heads/master |
| 805 | mark :3 |
| 806 | author Bob <bob@example.com> 1253744361 -0700 |
| 807 | committer Bob <bob@example.com> 1253744361 -0700 |
| 808 | data 8 |
| 809 | A and B |
| 810 | M 100644 :1 a |
| 811 | M 100644 :2 b |
| 812 | |
| 813 | blob |
| 814 | mark :4 |
| 815 | data 10 |
| 816 | Hello |
| 817 | You |
| 818 | |
| 819 | blob |
| 820 | mark :5 |
| 821 | data 8 |
| 822 | Bye |
| 823 | You |
| 824 | |
| 825 | commit refs/heads/origin |
| 826 | mark :6 |
| 827 | author Alice <alice@example.com> 1253744424 -0700 |
| 828 | committer Alice <alice@example.com> 1253744424 -0700 |
| 829 | data 13 |
| 830 | Personalized |
| 831 | from :3 |
| 832 | M 100644 :4 a |
| 833 | M 100644 :5 b |
| 834 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 835 | blob |
| 836 | mark :7 |
| 837 | data 5 |
| 838 | Mooh |
| 839 | |
| 840 | commit refs/heads/feature |
| 841 | mark :8 |
| 842 | author Bob <bob@example.com> 1390311986 -0000 |
| 843 | committer Bob <bob@example.com> 1390311986 -0000 |
| 844 | data 6 |
| 845 | Add C |
| 846 | from :3 |
| 847 | M 100644 :7 c |
| 848 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 849 | reset refs/heads/master |
| 850 | from :3 |
| 851 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 852 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 853 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 854 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 855 | def checkstdout(self, expected): |
| 856 | value = sys.stdout.getvalue() |
| 857 | sys.stdout.close() |
| 858 | # pylint: disable=E1101 |
| 859 | self.assertEquals(expected, strip_timestamps(value)) |
| 860 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 861 | @staticmethod |
| 862 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 863 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 864 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 865 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 866 | cwd=path).communicate() |
| 867 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 868 | # git is not available, skip this test. |
| 869 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 870 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
| 871 | stderr=STDOUT, cwd=path).communicate(input=git_import) |
| 872 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 873 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 874 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 875 | stderr=STDOUT, cwd=path).communicate() |
| 876 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 877 | stderr=STDOUT, cwd=path).communicate() |
| 878 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
| 879 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 880 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 881 | stderr=STDOUT, cwd=path).communicate() |
iannucci@chromium.org | 1e7187a | 2013-02-17 20:54:05 +0000 | [diff] [blame] | 882 | Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE, |
| 883 | stderr=STDOUT, cwd=path).communicate() |
| 884 | Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE, |
| 885 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 886 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 887 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 888 | def _GetAskForDataCallback(self, expected_prompt, return_value): |
| 889 | def AskForData(prompt, options): |
| 890 | self.assertEquals(prompt, expected_prompt) |
| 891 | return return_value |
| 892 | return AskForData |
| 893 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 894 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 895 | TestCaseUtils.setUp(self) |
| 896 | unittest.TestCase.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 897 | self.url = 'git://foo' |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 898 | # The .git suffix allows gclient_scm to recognize the dir as a git repo |
| 899 | # when cloning it locally |
| 900 | self.root_dir = tempfile.mkdtemp('.git') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 901 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 902 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 903 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 904 | StdoutCheck.setUp(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 905 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 906 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 907 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
| 908 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 909 | |
| 910 | def tearDown(self): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 911 | try: |
| 912 | rmtree(self.root_dir) |
| 913 | StdoutCheck.tearDown(self) |
| 914 | TestCaseUtils.tearDown(self) |
| 915 | unittest.TestCase.tearDown(self) |
| 916 | finally: |
| 917 | # TODO(maruel): Use auto_stub.TestCase. |
| 918 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
| 919 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 920 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 921 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 922 | class ManagedGitWrapperTestCase(BaseGitWrapperTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 923 | |
| 924 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 925 | if not self.enabled: |
| 926 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 927 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 928 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 929 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 930 | relpath=self.relpath) |
| 931 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 932 | scm.update(options, None, file_list) |
| 933 | gclient_scm.os.remove(file_path) |
| 934 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 935 | scm.revert(options, self.args, file_list) |
| 936 | self.assertEquals(file_list, [file_path]) |
| 937 | file_list = [] |
| 938 | scm.diff(options, self.args, file_list) |
| 939 | self.assertEquals(file_list, []) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 940 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 941 | |
| 942 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 943 | if not self.enabled: |
| 944 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 945 | options = self.Options() |
| 946 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 947 | relpath=self.relpath) |
| 948 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 949 | scm.update(options, None, file_list) |
| 950 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 951 | scm.revert(options, self.args, file_list) |
| 952 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 953 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 954 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 955 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 956 | |
| 957 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 958 | if not self.enabled: |
| 959 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 960 | options = self.Options() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 961 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 962 | relpath=self.relpath) |
| 963 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 964 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 965 | file_path = join(self.base_path, 'a') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 966 | open(file_path, 'a').writelines('touched\n') |
| 967 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 968 | scm.revert(options, self.args, file_list) |
| 969 | self.assertEquals(file_list, [file_path]) |
| 970 | file_list = [] |
| 971 | scm.diff(options, self.args, file_list) |
| 972 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 973 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 974 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 975 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 976 | |
| 977 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 978 | if not self.enabled: |
| 979 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 980 | options = self.Options() |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 981 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 982 | relpath=self.relpath) |
| 983 | file_list = [] |
| 984 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 985 | file_path = join(self.base_path, 'c') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 986 | f = open(file_path, 'w') |
| 987 | f.writelines('new\n') |
| 988 | f.close() |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 989 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 990 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 991 | file_list = [] |
| 992 | scm.revert(options, self.args, file_list) |
| 993 | self.assertEquals(file_list, [file_path]) |
| 994 | file_list = [] |
| 995 | scm.diff(options, self.args, file_list) |
| 996 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 997 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 998 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 999 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1000 | |
| 1001 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 1002 | if not self.enabled: |
| 1003 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1004 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1005 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1006 | open(file_path, 'a').writelines('touched\n') |
| 1007 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1008 | relpath=self.relpath) |
| 1009 | file_list = [] |
| 1010 | scm.status(options, self.args, file_list) |
| 1011 | self.assertEquals(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1012 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 1013 | ('running \'git diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1014 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1015 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1016 | |
| 1017 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 1018 | if not self.enabled: |
| 1019 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1020 | options = self.Options() |
| 1021 | expected_file_list = [] |
| 1022 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1023 | file_path = join(self.base_path, f) |
| 1024 | open(file_path, 'a').writelines('touched\n') |
| 1025 | expected_file_list.extend([file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1026 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1027 | relpath=self.relpath) |
| 1028 | file_list = [] |
| 1029 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1030 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1031 | self.assertEquals(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1032 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 1033 | ('running \'git diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1034 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1035 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1036 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1037 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 1038 | if not self.enabled: |
| 1039 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1040 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1041 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1042 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1043 | relpath=self.relpath) |
| 1044 | file_list = [] |
| 1045 | scm.update(options, (), file_list) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1046 | self.assertEquals(file_list, expected_file_list) |
| 1047 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1048 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1049 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1050 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 1051 | def testUpdateMerge(self): |
| 1052 | if not self.enabled: |
| 1053 | return |
| 1054 | options = self.Options() |
| 1055 | options.merge = True |
| 1056 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1057 | relpath=self.relpath) |
| 1058 | scm._Run(['checkout', '-q', 'feature'], options) |
| 1059 | rev = scm.revinfo(options, (), None) |
| 1060 | file_list = [] |
| 1061 | scm.update(options, (), file_list) |
| 1062 | self.assertEquals(file_list, [join(self.base_path, x) |
| 1063 | for x in ['a', 'b', 'c']]) |
| 1064 | # The actual commit that is created is unstable, so we verify its tree and |
| 1065 | # parents instead. |
| 1066 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 1067 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 1068 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^1']), rev) |
| 1069 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^2']), |
| 1070 | scm._Capture(['rev-parse', 'origin/master'])) |
| 1071 | sys.stdout.close() |
| 1072 | |
| 1073 | def testUpdateRebase(self): |
| 1074 | if not self.enabled: |
| 1075 | return |
| 1076 | options = self.Options() |
| 1077 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1078 | relpath=self.relpath) |
| 1079 | scm._Run(['checkout', '-q', 'feature'], options) |
| 1080 | file_list = [] |
| 1081 | # Fake a 'y' key press. |
| 1082 | scm._AskForData = self._GetAskForDataCallback( |
| 1083 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 1084 | '(y)es / (q)uit / (s)kip : ', 'y') |
| 1085 | scm.update(options, (), file_list) |
| 1086 | self.assertEquals(file_list, [join(self.base_path, x) |
| 1087 | for x in ['a', 'b', 'c']]) |
| 1088 | # The actual commit that is created is unstable, so we verify its tree and |
| 1089 | # parent instead. |
| 1090 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 1091 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 1092 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^']), |
| 1093 | scm._Capture(['rev-parse', 'origin/master'])) |
| 1094 | sys.stdout.close() |
| 1095 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1096 | def testUpdateReset(self): |
| 1097 | if not self.enabled: |
| 1098 | return |
| 1099 | options = self.Options() |
| 1100 | options.reset = True |
| 1101 | |
| 1102 | dir_path = join(self.base_path, 'c') |
| 1103 | os.mkdir(dir_path) |
| 1104 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 1105 | |
| 1106 | file_path = join(self.base_path, 'file') |
| 1107 | open(file_path, 'w').writelines('new\n') |
| 1108 | |
| 1109 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1110 | relpath=self.relpath) |
| 1111 | file_list = [] |
| 1112 | scm.update(options, (), file_list) |
| 1113 | self.assert_(gclient_scm.os.path.isdir(dir_path)) |
| 1114 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1115 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1116 | |
| 1117 | def testUpdateResetDeleteUnversionedTrees(self): |
| 1118 | if not self.enabled: |
| 1119 | return |
| 1120 | options = self.Options() |
| 1121 | options.reset = True |
| 1122 | options.delete_unversioned_trees = True |
| 1123 | |
| 1124 | dir_path = join(self.base_path, 'dir') |
| 1125 | os.mkdir(dir_path) |
| 1126 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 1127 | |
| 1128 | file_path = join(self.base_path, 'file') |
| 1129 | open(file_path, 'w').writelines('new\n') |
| 1130 | |
| 1131 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1132 | relpath=self.relpath) |
| 1133 | file_list = [] |
| 1134 | scm.update(options, (), file_list) |
| 1135 | self.assert_(not gclient_scm.os.path.isdir(dir_path)) |
| 1136 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1137 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1138 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 1139 | def testUpdateUnstagedConflict(self): |
| 1140 | if not self.enabled: |
| 1141 | return |
| 1142 | options = self.Options() |
| 1143 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1144 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1145 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1146 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1147 | try: |
| 1148 | scm.update(options, (), []) |
| 1149 | self.fail() |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 1150 | except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1151 | # The exact exception text varies across git versions so it's not worth |
| 1152 | # verifying it. It's fine as long as it throws. |
| 1153 | pass |
| 1154 | # Manually flush stdout since we can't verify it's content accurately across |
| 1155 | # git versions. |
| 1156 | sys.stdout.getvalue() |
| 1157 | sys.stdout.close() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 1158 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1159 | def testUpdateConflict(self): |
| 1160 | if not self.enabled: |
| 1161 | return |
| 1162 | options = self.Options() |
| 1163 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1164 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1165 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1166 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1167 | scm._Run(['commit', '-am', 'test'], options) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 1168 | scm._AskForData = self._GetAskForDataCallback( |
| 1169 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 1170 | '(y)es / (q)uit / (s)kip : ', 'y') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1171 | exception = ('Conflict while rebasing this branch.\n' |
| 1172 | 'Fix the conflict and run gclient again.\n' |
| 1173 | 'See \'man git-rebase\' for details.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1174 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 1175 | exception = ('\n____ . at refs/remotes/origin/master\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1176 | '\tYou have unstaged changes.\n' |
| 1177 | '\tPlease commit, stash, or reset.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1178 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 1179 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1180 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1181 | def testRevinfo(self): |
| 1182 | if not self.enabled: |
| 1183 | return |
| 1184 | options = self.Options() |
| 1185 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1186 | relpath=self.relpath) |
| 1187 | rev_info = scm.revinfo(options, (), None) |
| 1188 | self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
| 1189 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1190 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1191 | class ManagedGitWrapperTestCaseMox(BaseTestCase): |
| 1192 | class OptionsObject(object): |
| 1193 | def __init__(self, verbose=False, revision=None, force=False): |
| 1194 | self.verbose = verbose |
| 1195 | self.revision = revision |
| 1196 | self.deps_os = None |
| 1197 | self.force = force |
| 1198 | self.reset = False |
| 1199 | self.nohooks = False |
| 1200 | # TODO(maruel): Test --jobs > 1. |
| 1201 | self.jobs = 1 |
| 1202 | |
| 1203 | def Options(self, *args, **kwargs): |
| 1204 | return self.OptionsObject(*args, **kwargs) |
| 1205 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1206 | def checkstdout(self, expected): |
| 1207 | value = sys.stdout.getvalue() |
primiano@chromium.org | 69177ea | 2014-08-05 23:19:29 +0000 | [diff] [blame^] | 1208 | sys.stdout.close() |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1209 | # pylint: disable=E1101 |
| 1210 | self.assertEquals(expected, strip_timestamps(value)) |
| 1211 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1212 | def setUp(self): |
| 1213 | BaseTestCase.setUp(self) |
| 1214 | self.fake_hash_1 = 't0ta11yf4k3' |
| 1215 | self.fake_hash_2 = '3v3nf4k3r' |
| 1216 | self.url = 'git://foo' |
maruel@chromium.org | 9717013 | 2013-05-08 14:58:34 +0000 | [diff] [blame] | 1217 | self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1218 | self.relpath = 'fake' |
| 1219 | self.base_path = os.path.join(self.root_dir, self.relpath) |
| 1220 | |
| 1221 | def tearDown(self): |
| 1222 | BaseTestCase.tearDown(self) |
| 1223 | |
| 1224 | def testGetUsableRevGit(self): |
| 1225 | # pylint: disable=E1101 |
| 1226 | options = self.Options(verbose=True) |
| 1227 | |
| 1228 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 1229 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 1230 | ).AndReturn(True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1231 | |
| 1232 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 1233 | gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1234 | ).AndReturn(False) |
| 1235 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1236 | gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1237 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1238 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1239 | self.mox.ReplayAll() |
| 1240 | |
| 1241 | git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1242 | relpath=self.relpath) |
| 1243 | # A [fake] git sha1 with a git repo should work (this is in the case that |
| 1244 | # the LKGR gets flipped to git sha1's some day). |
| 1245 | self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options), |
| 1246 | self.fake_hash_1) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1247 | # An SVN rev with an existing purely git repo should raise an exception. |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1248 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1249 | git_scm.GetUsableRev, '1', options) |
| 1250 | |
| 1251 | def testGetUsableRevGitSvn(self): |
| 1252 | # pylint: disable=E1101 |
| 1253 | options = self.Options() |
| 1254 | too_big = str(1e7) |
| 1255 | |
| 1256 | # Pretend like the git-svn repo's HEAD is at r2. |
| 1257 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'GetGitSvnHeadRev', True) |
| 1258 | gclient_scm.scm.GIT.GetGitSvnHeadRev(cwd=self.base_path).MultipleTimes( |
| 1259 | ).AndReturn(2) |
| 1260 | |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1261 | self.mox.StubOutWithMock( |
| 1262 | gclient_scm.scm.GIT, 'GetBlessedSha1ForSvnRev', True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1263 | # r1 -> first fake hash, r3 -> second fake hash. |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1264 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='1' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1265 | ).AndReturn(self.fake_hash_1) |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1266 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='3' |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1267 | ).MultipleTimes().AndReturn(self.fake_hash_2) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1268 | |
| 1269 | # Ensure that we call git svn fetch if our LKGR is > the git-svn HEAD rev. |
dnj@chromium.org | 680f217 | 2014-06-25 00:39:32 +0000 | [diff] [blame] | 1270 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Fetch', True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1271 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1272 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 1273 | cwd=self.base_path).AndReturn('blah') |
dnj@chromium.org | 680f217 | 2014-06-25 00:39:32 +0000 | [diff] [blame] | 1274 | # pylint: disable=E1120 |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1275 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
| 1276 | error = subprocess2.CalledProcessError(1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 1277 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 1278 | cwd=self.base_path).AndRaise(error) |
dnj@chromium.org | 680f217 | 2014-06-25 00:39:32 +0000 | [diff] [blame] | 1279 | gclient_scm.GitWrapper._Fetch(options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1280 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
smut@google.com | d33eab3 | 2014-07-07 19:35:18 +0000 | [diff] [blame] | 1281 | gclient_scm.GitWrapper._Fetch(options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1282 | |
| 1283 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 1284 | gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1285 | ).AndReturn(True) |
| 1286 | |
| 1287 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 1288 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 1289 | ).AndReturn(True) |
| 1290 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=too_big |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1291 | ).MultipleTimes(2).AndReturn(False) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1292 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1293 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
| 1294 | gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True) |
| 1295 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1296 | self.mox.ReplayAll() |
| 1297 | |
| 1298 | git_svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1299 | relpath=self.relpath) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1300 | # Without an existing checkout, this should fail. |
| 1301 | # TODO(dbeam) Fix this. http://crbug.com/109184 |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1302 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1303 | git_svn_scm.GetUsableRev, '1', options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1304 | # Given an SVN revision with a git-svn checkout, it should be translated to |
| 1305 | # a git sha1 and be usable. |
| 1306 | self.assertEquals(git_svn_scm.GetUsableRev('1', options), |
| 1307 | self.fake_hash_1) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1308 | # Our fake HEAD rev is r2, so this should call git fetch and git svn fetch |
| 1309 | # to get more revs (pymox will complain if this doesn't happen). We mock an |
| 1310 | # optimized checkout the first time, so this run should call git fetch. |
| 1311 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 1312 | self.fake_hash_2) |
| 1313 | # The time we pretend we're not optimized, so no git fetch should fire. |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1314 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 1315 | self.fake_hash_2) |
| 1316 | # Given a git sha1 with a git-svn checkout, it should be used as is. |
| 1317 | self.assertEquals(git_svn_scm.GetUsableRev(self.fake_hash_1, options), |
| 1318 | self.fake_hash_1) |
| 1319 | # We currently check for seemingly valid SVN revisions by assuming 6 digit |
| 1320 | # numbers, so assure that numeric revs >= 1000000 don't work. |
| 1321 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1322 | git_svn_scm.GetUsableRev, too_big, options) |
| 1323 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1324 | def testUpdateNoDotGit(self): |
| 1325 | options = self.Options() |
| 1326 | |
szager@chromium.org | 8a13970 | 2014-06-20 15:55:01 +0000 | [diff] [blame] | 1327 | gclient_scm.os.path.isdir( |
| 1328 | os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1329 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 1330 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 1331 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 1332 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1333 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
| 1334 | # pylint: disable=E1120 |
| 1335 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 1336 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1337 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1338 | gclient_scm.subprocess2.check_output( |
| 1339 | ['git', 'ls-files'], cwd=self.base_path, |
| 1340 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1341 | gclient_scm.subprocess2.check_output( |
| 1342 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 1343 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1344 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1345 | stderr=-1, |
| 1346 | ).AndReturn('') |
| 1347 | |
| 1348 | self.mox.ReplayAll() |
| 1349 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1350 | relpath=self.relpath) |
| 1351 | scm.update(options, None, []) |
| 1352 | self.checkstdout('\n') |
| 1353 | |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 1354 | def testUpdateConflict(self): |
| 1355 | options = self.Options() |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1356 | |
szager@chromium.org | 8a13970 | 2014-06-20 15:55:01 +0000 | [diff] [blame] | 1357 | gclient_scm.os.path.isdir( |
| 1358 | os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1359 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 1360 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 1361 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 1362 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1363 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
| 1364 | # pylint: disable=E1120 |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 1365 | gclient_scm.GitWrapper._Clone( |
| 1366 | 'refs/remotes/origin/master', self.url, options |
| 1367 | ).AndRaise(gclient_scm.subprocess2.CalledProcessError(None, None, None, |
| 1368 | None, None)) |
| 1369 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_DeleteOrMove', True) |
| 1370 | gclient_scm.GitWrapper._DeleteOrMove(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1371 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 1372 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1373 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1374 | gclient_scm.subprocess2.check_output( |
| 1375 | ['git', 'ls-files'], cwd=self.base_path, |
| 1376 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1377 | gclient_scm.subprocess2.check_output( |
| 1378 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 1379 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1380 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1381 | stderr=-1, |
| 1382 | ).AndReturn('') |
| 1383 | |
| 1384 | self.mox.ReplayAll() |
| 1385 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1386 | relpath=self.relpath) |
| 1387 | scm.update(options, None, []) |
| 1388 | self.checkstdout('\n') |
| 1389 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1390 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1391 | class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1392 | def checkInStdout(self, expected): |
| 1393 | value = sys.stdout.getvalue() |
| 1394 | sys.stdout.close() |
| 1395 | # pylint: disable=E1101 |
| 1396 | self.assertIn(expected, value) |
| 1397 | |
| 1398 | def checkNotInStdout(self, expected): |
| 1399 | value = sys.stdout.getvalue() |
| 1400 | sys.stdout.close() |
| 1401 | # pylint: disable=E1101 |
| 1402 | self.assertNotIn(expected, value) |
| 1403 | |
| 1404 | def getCurrentBranch(self): |
| 1405 | # Returns name of current branch or HEAD for detached HEAD |
| 1406 | branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'], |
| 1407 | cwd=self.base_path) |
| 1408 | if branch == 'HEAD': |
| 1409 | return None |
| 1410 | return branch |
| 1411 | |
| 1412 | def testUpdateClone(self): |
| 1413 | if not self.enabled: |
| 1414 | return |
| 1415 | options = self.Options() |
| 1416 | |
| 1417 | origin_root_dir = self.root_dir |
| 1418 | self.root_dir = tempfile.mkdtemp() |
| 1419 | self.relpath = '.' |
| 1420 | self.base_path = join(self.root_dir, self.relpath) |
| 1421 | |
| 1422 | scm = gclient_scm.CreateSCM(url=origin_root_dir, |
| 1423 | root_dir=self.root_dir, |
| 1424 | relpath=self.relpath) |
| 1425 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1426 | expected_file_list = [join(self.base_path, "a"), |
| 1427 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1428 | file_list = [] |
| 1429 | options.revision = 'unmanaged' |
| 1430 | scm.update(options, (), file_list) |
| 1431 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1432 | self.assertEquals(file_list, expected_file_list) |
| 1433 | self.assertEquals(scm.revinfo(options, (), None), |
| 1434 | '069c602044c5388d2d15c3f875b057c852003458') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1435 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1436 | self.assertEquals(self.getCurrentBranch(), None) |
| 1437 | self.checkInStdout( |
| 1438 | 'Checked out refs/remotes/origin/master to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1439 | |
| 1440 | rmtree(origin_root_dir) |
| 1441 | |
| 1442 | def testUpdateCloneOnCommit(self): |
| 1443 | if not self.enabled: |
| 1444 | return |
| 1445 | options = self.Options() |
| 1446 | |
| 1447 | origin_root_dir = self.root_dir |
| 1448 | self.root_dir = tempfile.mkdtemp() |
| 1449 | self.relpath = '.' |
| 1450 | self.base_path = join(self.root_dir, self.relpath) |
| 1451 | url_with_commit_ref = origin_root_dir +\ |
| 1452 | '@a7142dc9f0009350b96a11f372b6ea658592aa95' |
| 1453 | |
| 1454 | scm = gclient_scm.CreateSCM(url=url_with_commit_ref, |
| 1455 | root_dir=self.root_dir, |
| 1456 | relpath=self.relpath) |
| 1457 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1458 | expected_file_list = [join(self.base_path, "a"), |
| 1459 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1460 | file_list = [] |
| 1461 | options.revision = 'unmanaged' |
| 1462 | scm.update(options, (), file_list) |
| 1463 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1464 | self.assertEquals(file_list, expected_file_list) |
| 1465 | self.assertEquals(scm.revinfo(options, (), None), |
| 1466 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1467 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1468 | self.assertEquals(self.getCurrentBranch(), None) |
| 1469 | self.checkInStdout( |
| 1470 | 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1471 | |
| 1472 | rmtree(origin_root_dir) |
| 1473 | |
| 1474 | def testUpdateCloneOnBranch(self): |
| 1475 | if not self.enabled: |
| 1476 | return |
| 1477 | options = self.Options() |
| 1478 | |
| 1479 | origin_root_dir = self.root_dir |
| 1480 | self.root_dir = tempfile.mkdtemp() |
| 1481 | self.relpath = '.' |
| 1482 | self.base_path = join(self.root_dir, self.relpath) |
| 1483 | url_with_branch_ref = origin_root_dir + '@feature' |
| 1484 | |
| 1485 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 1486 | root_dir=self.root_dir, |
| 1487 | relpath=self.relpath) |
| 1488 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1489 | expected_file_list = [join(self.base_path, "a"), |
| 1490 | join(self.base_path, "b"), |
| 1491 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1492 | file_list = [] |
| 1493 | options.revision = 'unmanaged' |
| 1494 | scm.update(options, (), file_list) |
| 1495 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1496 | self.assertEquals(file_list, expected_file_list) |
| 1497 | self.assertEquals(scm.revinfo(options, (), None), |
| 1498 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 1499 | self.assertEquals(self.getCurrentBranch(), 'feature') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1500 | self.checkNotInStdout('Checked out feature to a detached HEAD') |
| 1501 | |
| 1502 | rmtree(origin_root_dir) |
| 1503 | |
| 1504 | def testUpdateCloneOnDetachedBranch(self): |
| 1505 | if not self.enabled: |
| 1506 | return |
| 1507 | options = self.Options() |
| 1508 | |
| 1509 | origin_root_dir = self.root_dir |
| 1510 | self.root_dir = tempfile.mkdtemp() |
| 1511 | self.relpath = '.' |
| 1512 | self.base_path = join(self.root_dir, self.relpath) |
| 1513 | url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature' |
| 1514 | |
| 1515 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 1516 | root_dir=self.root_dir, |
| 1517 | relpath=self.relpath) |
| 1518 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1519 | expected_file_list = [join(self.base_path, "a"), |
| 1520 | join(self.base_path, "b"), |
| 1521 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1522 | file_list = [] |
| 1523 | options.revision = 'unmanaged' |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1524 | scm.update(options, (), file_list) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1525 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1526 | self.assertEquals(file_list, expected_file_list) |
| 1527 | self.assertEquals(scm.revinfo(options, (), None), |
| 1528 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1529 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1530 | self.assertEquals(self.getCurrentBranch(), None) |
| 1531 | self.checkInStdout( |
| 1532 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1533 | |
| 1534 | rmtree(origin_root_dir) |
| 1535 | |
| 1536 | def testUpdateCloneOnBranchHead(self): |
| 1537 | if not self.enabled: |
| 1538 | return |
| 1539 | options = self.Options() |
| 1540 | |
| 1541 | origin_root_dir = self.root_dir |
| 1542 | self.root_dir = tempfile.mkdtemp() |
| 1543 | self.relpath = '.' |
| 1544 | self.base_path = join(self.root_dir, self.relpath) |
| 1545 | url_with_branch_ref = origin_root_dir + '@refs/heads/feature' |
| 1546 | |
| 1547 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 1548 | root_dir=self.root_dir, |
| 1549 | relpath=self.relpath) |
| 1550 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1551 | expected_file_list = [join(self.base_path, "a"), |
| 1552 | join(self.base_path, "b"), |
| 1553 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1554 | file_list = [] |
| 1555 | options.revision = 'unmanaged' |
| 1556 | scm.update(options, (), file_list) |
| 1557 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 1558 | self.assertEquals(file_list, expected_file_list) |
| 1559 | self.assertEquals(scm.revinfo(options, (), None), |
| 1560 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 1561 | self.assertEquals(self.getCurrentBranch(), 'feature') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 1562 | self.checkNotInStdout( |
| 1563 | 'Checked out refs/heads/feature to a detached HEAD') |
| 1564 | |
| 1565 | rmtree(origin_root_dir) |
| 1566 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1567 | def testUpdateUpdate(self): |
| 1568 | if not self.enabled: |
| 1569 | return |
| 1570 | options = self.Options() |
| 1571 | expected_file_list = [] |
| 1572 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1573 | relpath=self.relpath) |
| 1574 | file_list = [] |
| 1575 | options.revision = 'unmanaged' |
| 1576 | scm.update(options, (), file_list) |
| 1577 | self.assertEquals(file_list, expected_file_list) |
| 1578 | self.assertEquals(scm.revinfo(options, (), None), |
| 1579 | '069c602044c5388d2d15c3f875b057c852003458') |
| 1580 | self.checkstdout('________ unmanaged solution; skipping .\n') |
| 1581 | |
| 1582 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1583 | if __name__ == '__main__': |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 1584 | level = logging.DEBUG if '-v' in sys.argv else logging.FATAL |
| 1585 | logging.basicConfig( |
| 1586 | level=level, |
| 1587 | format='%(asctime).19s %(levelname)s %(filename)s:' |
| 1588 | '%(lineno)s %(message)s') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1589 | unittest.main() |
| 1590 | |
| 1591 | # vim: ts=2:sw=2:tw=80:et: |