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 |
| 16 | import sys |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 17 | import tempfile |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 18 | import unittest |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 19 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 20 | 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] | 21 | |
maruel@chromium.org | 0927b7e | 2011-11-11 16:06:22 +0000 | [diff] [blame] | 22 | from testing_support.super_mox import mox, StdoutCheck, SuperMoxTestBase |
| 23 | from testing_support.super_mox import TestCaseUtils |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 24 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 25 | import gclient_scm |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 26 | import subprocess2 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 27 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 28 | # Shortcut since this function is used often |
| 29 | join = gclient_scm.os.path.join |
| 30 | |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 31 | |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 32 | # Access to a protected member XXX of a client class |
| 33 | # pylint: disable=W0212 |
| 34 | |
| 35 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 36 | class GCBaseTestCase(object): |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 37 | def assertRaisesError(self, msg, fn, *args, **kwargs): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 38 | """Like unittest's assertRaises() but checks for Gclient.Error.""" |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 39 | # pylint: disable=E1101 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 40 | try: |
| 41 | fn(*args, **kwargs) |
| 42 | except gclient_scm.gclient_utils.Error, e: |
| 43 | self.assertEquals(e.args[0], msg) |
| 44 | else: |
| 45 | self.fail('%s not raised' % msg) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 46 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 47 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 48 | class BaseTestCase(GCBaseTestCase, SuperMoxTestBase): |
| 49 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 50 | SuperMoxTestBase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 51 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter') |
| 52 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, |
| 53 | 'CheckCallAndFilterAndHeader') |
| 54 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead') |
| 55 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite') |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 56 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'rmtree') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 57 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 58 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, '_CaptureInfo') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 59 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus') |
| 60 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList') |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 61 | self.mox.StubOutWithMock(subprocess2, 'communicate') |
| 62 | self.mox.StubOutWithMock(subprocess2, 'Popen') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 63 | self._scm_wrapper = gclient_scm.CreateSCM |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 64 | gclient_scm.scm.SVN.current_version = None |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 65 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 66 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 67 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
| 68 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 69 | # Absolute path of the fake checkout directory. |
| 70 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 71 | |
| 72 | def tearDown(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 73 | SuperMoxTestBase.tearDown(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 74 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 75 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 76 | |
| 77 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 78 | class SVNWrapperTestCase(BaseTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 79 | class OptionsObject(object): |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 80 | def __init__(self, verbose=False, revision=None, force=False): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 81 | self.verbose = verbose |
| 82 | self.revision = revision |
| 83 | self.manually_grab_svn_rev = True |
| 84 | self.deps_os = None |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 85 | self.force = force |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 86 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 87 | self.nohooks = False |
maruel@chromium.org | 36ac239 | 2011-10-12 16:36:11 +0000 | [diff] [blame] | 88 | # TODO(maruel): Test --jobs > 1. |
| 89 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 90 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 91 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 92 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 93 | return self.OptionsObject(*args, **kwargs) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 94 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 95 | def setUp(self): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 96 | BaseTestCase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 97 | self.url = self.SvnUrl() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 98 | |
| 99 | def testDir(self): |
| 100 | members = [ |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 101 | 'BinaryExists', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 102 | 'FullUrlForRelativeUrl', |
xusydoc@chromium.org | 885a960 | 2013-05-31 09:54:40 +0000 | [diff] [blame] | 103 | 'GetCheckoutRoot', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 104 | 'GetRevisionDate', |
| 105 | 'GetUsableRev', |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 106 | 'Svnversion', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 107 | 'RunCommand', |
| 108 | 'cleanup', |
| 109 | 'diff', |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 110 | 'name', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 111 | 'pack', |
| 112 | 'relpath', |
| 113 | 'revert', |
| 114 | 'revinfo', |
| 115 | 'runhooks', |
| 116 | 'status', |
| 117 | 'update', |
| 118 | 'updatesingle', |
| 119 | 'url', |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 120 | ] |
| 121 | |
| 122 | # If you add a member, be sure to add the relevant test! |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 123 | self.compareMembers(self._scm_wrapper('svn://a'), members) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 124 | |
| 125 | def testUnsupportedSCM(self): |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 126 | args = ['gopher://foo', self.root_dir, self.relpath] |
| 127 | exception_msg = 'No SCM found for url gopher://foo' |
| 128 | self.assertRaisesError(exception_msg, self._scm_wrapper, *args) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 129 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 130 | def testSVNFullUrlForRelativeUrl(self): |
| 131 | self.url = 'svn://a/b/c/d' |
| 132 | |
| 133 | self.mox.ReplayAll() |
| 134 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 135 | relpath=self.relpath) |
| 136 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'svn://a/b/crap') |
| 137 | |
| 138 | def testGITFullUrlForRelativeUrl(self): |
| 139 | self.url = 'git://a/b/c/d' |
| 140 | |
| 141 | self.mox.ReplayAll() |
| 142 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 143 | relpath=self.relpath) |
| 144 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'git://a/b/c/crap') |
| 145 | |
igorgatis@gmail.com | 4e07567 | 2011-11-21 16:35:08 +0000 | [diff] [blame] | 146 | def testGITFakeHttpUrl(self): |
| 147 | self.url = 'git+http://foo' |
| 148 | |
| 149 | self.mox.ReplayAll() |
| 150 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 151 | relpath=self.relpath) |
| 152 | self.assertEqual(scm.url, 'http://foo') |
| 153 | |
| 154 | def testGITFakeHttpsUrl(self): |
| 155 | self.url = 'git+https://foo' |
| 156 | |
| 157 | self.mox.ReplayAll() |
| 158 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 159 | relpath=self.relpath) |
| 160 | self.assertEqual(scm.url, 'https://foo') |
| 161 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 162 | def testRunCommandException(self): |
| 163 | options = self.Options(verbose=False) |
mmoss@chromium.org | 50fd47f | 2014-02-13 01:03:19 +0000 | [diff] [blame] | 164 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 165 | self.mox.ReplayAll() |
| 166 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 167 | relpath=self.relpath) |
| 168 | exception = "Unsupported argument(s): %s" % ','.join(self.args) |
| 169 | self.assertRaisesError(exception, scm.RunCommand, |
| 170 | 'update', options, self.args) |
| 171 | |
| 172 | def testRunCommandUnknown(self): |
| 173 | # TODO(maruel): if ever used. |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 174 | pass |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 175 | |
| 176 | def testRevertMissing(self): |
| 177 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 178 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 179 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 180 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 181 | ).AndReturn('1.5.1') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 182 | # It'll to a checkout instead. |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 183 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 184 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 185 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 186 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 187 | gclient_scm.os.makedirs(parent) |
| 188 | gclient_scm.os.path.exists(parent).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 189 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 190 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 191 | options.verbose, |
| 192 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 193 | cwd=self.root_dir, |
| 194 | file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 195 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 196 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 197 | ).AndReturn({'Revision': 100}) |
| 198 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 199 | self.mox.ReplayAll() |
| 200 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 201 | relpath=self.relpath) |
| 202 | scm.revert(options, self.args, files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 203 | self.checkstdout( |
| 204 | ('\n_____ %s is missing, synching instead\n' % self.relpath)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 205 | |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 206 | def testRevertNoDotSvn(self): |
| 207 | options = self.Options(verbose=True, force=True) |
| 208 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 209 | 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] | 210 | gclient_scm.os.path.isdir(join(self.base_path, '.git')).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 211 | # Checkout. |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 212 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 213 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 214 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 215 | gclient_scm.os.makedirs(parent) |
| 216 | gclient_scm.os.path.exists(parent).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 217 | files_list = self.mox.CreateMockAnything() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 218 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 219 | ).AndReturn('1.6') |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 220 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 221 | options.verbose, |
| 222 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 223 | cwd=self.root_dir, |
| 224 | file_list=files_list) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 225 | gclient_scm.gclient_utils.rmtree(self.base_path) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 226 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 227 | ).AndReturn({'Revision': 100}) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 228 | self.mox.ReplayAll() |
| 229 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 230 | relpath=self.relpath) |
| 231 | scm.revert(options, self.args, files_list) |
| 232 | self.checkstdout( |
| 233 | '\n_____ %s is not a valid svn checkout, synching instead\n' % |
| 234 | self.relpath) |
| 235 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 236 | def testRevertNone(self): |
| 237 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 238 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 239 | 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] | 240 | gclient_scm.scm.SVN.CaptureStatus( |
| 241 | None, self.base_path, no_ignore=False).AndReturn([]) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 242 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 243 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 244 | options.verbose, |
| 245 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 246 | cwd=self.base_path, |
| 247 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 248 | |
| 249 | self.mox.ReplayAll() |
| 250 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 251 | relpath=self.relpath) |
| 252 | file_list = [] |
| 253 | scm.revert(options, self.args, file_list) |
| 254 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 255 | def testRevertDirectory(self): |
| 256 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 257 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 258 | 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] | 259 | items = [ |
| 260 | ('~ ', 'a'), |
| 261 | ] |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 262 | gclient_scm.scm.SVN.CaptureStatus( |
| 263 | None, self.base_path, no_ignore=False).AndReturn(items) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 264 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 265 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 266 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
msb@chromium.org | 32906d1 | 2010-01-12 18:22:09 +0000 | [diff] [blame] | 267 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 268 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 269 | gclient_scm.gclient_utils.rmtree(file_path) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 270 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 271 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 272 | options.verbose, |
| 273 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 274 | cwd=self.base_path, |
| 275 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 276 | |
| 277 | self.mox.ReplayAll() |
| 278 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 279 | relpath=self.relpath) |
| 280 | file_list2 = [] |
| 281 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 282 | self.checkstdout(('%s\n' % file_path)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 283 | |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 284 | def testRevertDot(self): |
| 285 | self.mox.StubOutWithMock(gclient_scm.SVNWrapper, 'update') |
| 286 | options = self.Options(verbose=True) |
| 287 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 288 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
| 289 | items = [ |
| 290 | ('~ ', '.'), |
| 291 | ] |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 292 | gclient_scm.scm.SVN.CaptureStatus( |
| 293 | None, self.base_path, no_ignore=False).AndReturn(items) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 294 | # 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] | 295 | file_path = self.base_path |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 296 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 297 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
| 298 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
| 299 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 300 | gclient_scm.gclient_utils.rmtree(file_path) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 301 | # pylint: disable=E1120 |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 302 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 303 | gclient_scm.SVNWrapper.update(options, [], ['.']) |
| 304 | |
| 305 | self.mox.ReplayAll() |
| 306 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 307 | relpath=self.relpath) |
| 308 | file_list2 = [] |
| 309 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 6208757 | 2012-04-24 23:16:28 +0000 | [diff] [blame] | 310 | self.checkstdout(('%s\n' % os.path.join(file_path, '.'))) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 311 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 312 | def testStatus(self): |
| 313 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 314 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 315 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 316 | options.verbose, |
| 317 | ['status'] + self.args + ['--ignore-externals'], |
| 318 | cwd=self.base_path, |
| 319 | file_list=[]).AndReturn(None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 320 | |
| 321 | self.mox.ReplayAll() |
| 322 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 323 | relpath=self.relpath) |
| 324 | file_list = [] |
| 325 | self.assertEqual(scm.status(options, self.args, file_list), None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 326 | |
| 327 | # TODO(maruel): TEST REVISIONS!!! |
| 328 | # TODO(maruel): TEST RELOCATE!!! |
| 329 | def testUpdateCheckout(self): |
| 330 | options = self.Options(verbose=True) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 331 | file_info = gclient_scm.gclient_utils.PrintableObject() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 332 | file_info.root = 'blah' |
| 333 | file_info.url = self.url |
| 334 | file_info.uuid = 'ABC' |
| 335 | file_info.revision = 42 |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 336 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 337 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 338 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 339 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 340 | gclient_scm.os.makedirs(parent) |
| 341 | gclient_scm.os.path.exists(parent).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 342 | files_list = self.mox.CreateMockAnything() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 343 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 344 | ).AndReturn('1.5.1') |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 345 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 346 | options.verbose, |
| 347 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 348 | cwd=self.root_dir, |
| 349 | file_list=files_list) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 350 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 351 | ).AndReturn({'Revision': 100}) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 352 | self.mox.ReplayAll() |
| 353 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 354 | relpath=self.relpath) |
| 355 | scm.update(options, (), files_list) |
| 356 | |
| 357 | def testUpdateUpdate(self): |
| 358 | options = self.Options(verbose=True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 359 | options.force = True |
| 360 | options.nohooks = False |
| 361 | file_info = { |
| 362 | 'Repository Root': 'blah', |
| 363 | 'URL': self.url, |
| 364 | 'UUID': 'ABC', |
| 365 | 'Revision': 42, |
| 366 | } |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 367 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 368 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 369 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 370 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 371 | # Checkout or update. |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 372 | dotted_path = join(self.base_path, '.') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 373 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 374 | |
| 375 | # Verify no locked files. |
| 376 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([]) |
| 377 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 378 | # Cheat a bit here. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 379 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 380 | ).AndReturn(file_info) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 381 | |
| 382 | # _AddAdditionalUpdateFlags() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 383 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 384 | ).AndReturn('1.5.1') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 385 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 386 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 387 | ).AndReturn({'Revision': 100}) |
| 388 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 389 | additional_args = [] |
| 390 | if options.manually_grab_svn_rev: |
| 391 | additional_args = ['--revision', str(file_info['Revision'])] |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 392 | additional_args.extend(['--force', '--ignore-externals']) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 393 | files_list = [] |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 394 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | 0380707 | 2010-08-16 17:18:44 +0000 | [diff] [blame] | 395 | options.verbose, |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 396 | ['update', self.base_path] + additional_args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 397 | cwd=self.root_dir, file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 398 | |
| 399 | self.mox.ReplayAll() |
| 400 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 401 | relpath=self.relpath) |
| 402 | scm.update(options, (), files_list) |
| 403 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 404 | def testUpdateReset(self): |
| 405 | options = self.Options(verbose=True) |
| 406 | options.reset = True |
| 407 | file_info = { |
| 408 | 'Repository Root': 'blah', |
| 409 | 'URL': self.url, |
| 410 | 'UUID': 'ABC', |
| 411 | 'Revision': 42, |
| 412 | } |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +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. |
| 422 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path |
| 423 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 424 | |
| 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) |
| 436 | self.checkstdout('\n_____ %s at 42\n' % self.relpath) |
| 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 | } |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 449 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 450 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 451 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 452 | |
| 453 | # Checkout or update. |
| 454 | dotted_path = join(self.base_path, '.') |
| 455 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 456 | |
| 457 | # Create an untracked file and directory. |
| 458 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path |
| 459 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 460 | |
| 461 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 462 | ).AndReturn(file_info) |
| 463 | |
| 464 | # Confirm that the untracked file is removed. |
| 465 | gclient_scm.scm.SVN.CaptureStatus(None, self.base_path |
| 466 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 467 | gclient_scm.os.path.isdir(join(self.base_path, 'dir')).AndReturn(True) |
| 468 | gclient_scm.os.path.isdir(join(self.base_path, 'file')).AndReturn(False) |
| 469 | 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] | 470 | gclient_scm.gclient_utils.rmtree(join(self.base_path, 'dir')) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 471 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 472 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 473 | ).AndReturn({'Revision': 100}) |
| 474 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 475 | self.mox.ReplayAll() |
| 476 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 477 | relpath=self.relpath) |
| 478 | files_list = [] |
| 479 | scm.update(options, (), files_list) |
| 480 | self.checkstdout( |
| 481 | ('\n_____ %s at 42\n' |
| 482 | '\n_____ removing unversioned directory dir\n') % self.relpath) |
| 483 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 484 | def testUpdateSingleCheckout(self): |
| 485 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 486 | file_info = { |
| 487 | 'URL': self.url, |
| 488 | 'Revision': 42, |
| 489 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 490 | |
| 491 | # Checks to make sure that we support svn co --depth. |
| 492 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 493 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 494 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 495 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
| 496 | 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] | 497 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 498 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 499 | dotted_path = join(self.base_path, '.') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 500 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 501 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 502 | # 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] | 503 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 504 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 505 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 506 | always=True, |
| 507 | cwd=self.root_dir) |
| 508 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 509 | options.verbose, |
| 510 | ['update', 'DEPS', '--ignore-externals'], |
| 511 | cwd=self.base_path, |
| 512 | file_list=files_list) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 513 | |
| 514 | # Now we fall back on scm.update(). |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 515 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 516 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 517 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 518 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 519 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 520 | ).AndReturn(file_info) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 521 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 522 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 523 | ).AndReturn({'Revision': 100}) |
| 524 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 525 | self.mox.ReplayAll() |
| 526 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 527 | relpath=self.relpath) |
| 528 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 529 | self.checkstdout('\n_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 530 | |
| 531 | def testUpdateSingleCheckoutSVN14(self): |
| 532 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 533 | |
| 534 | # Checks to make sure that we support svn co --depth. |
| 535 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 536 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 537 | ).AndReturn('1.4.4') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 538 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 539 | |
| 540 | # When checking out a single file with svn 1.4, we use svn export |
| 541 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 542 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 543 | ['svn', 'export', join(self.url, 'DEPS'), join(self.base_path, 'DEPS')], |
scottmg@chromium.org | f547c80 | 2013-09-27 17:55:26 +0000 | [diff] [blame] | 544 | always=True, cwd=self.root_dir) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 545 | |
| 546 | self.mox.ReplayAll() |
| 547 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 548 | relpath=self.relpath) |
| 549 | scm.updatesingle(options, ['DEPS'], files_list) |
| 550 | |
| 551 | def testUpdateSingleCheckoutSVNUpgrade(self): |
| 552 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 553 | file_info = { |
| 554 | 'URL': self.url, |
| 555 | 'Revision': 42, |
| 556 | } |
| 557 | |
| 558 | # Checks to make sure that we support svn co --depth. |
| 559 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 560 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 561 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 562 | 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] | 563 | # If DEPS already exists, assume we're upgrading from svn1.4, so delete |
| 564 | # the old DEPS file. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 565 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(True) |
| 566 | gclient_scm.os.remove(join(self.base_path, 'DEPS')) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 567 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 568 | # Verify no locked files. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 569 | gclient_scm.scm.SVN.CaptureStatus( |
| 570 | None, join(self.base_path, '.')).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 571 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 572 | # When checking out a single file, we issue an svn checkout and svn update. |
| 573 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 574 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 575 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 576 | always=True, |
| 577 | cwd=self.root_dir) |
| 578 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 579 | options.verbose, |
| 580 | ['update', 'DEPS', '--ignore-externals'], |
| 581 | cwd=self.base_path, |
| 582 | file_list=files_list) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 583 | |
| 584 | # Now we fall back on scm.update(). |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 585 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 586 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 587 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 588 | gclient_scm.scm.SVN._CaptureInfo( |
| 589 | [], join(self.base_path, ".")).AndReturn(file_info) |
| 590 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 591 | ).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 592 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 593 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 594 | ).AndReturn({'Revision': 100}) |
| 595 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 596 | self.mox.ReplayAll() |
| 597 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 598 | relpath=self.relpath) |
| 599 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 600 | self.checkstdout( |
| 601 | ('\n_____ %s at 42\n' % self.relpath)) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 602 | |
| 603 | def testUpdateSingleUpdate(self): |
| 604 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 605 | file_info = { |
| 606 | 'URL': self.url, |
| 607 | 'Revision': 42, |
| 608 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 609 | # Checks to make sure that we support svn co --depth. |
| 610 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 611 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 612 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 613 | 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] | 614 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 615 | # Verify no locked files. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 616 | gclient_scm.scm.SVN.CaptureStatus(None, join(self.base_path, '.') |
| 617 | ).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 618 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 619 | # Now we fall back on scm.update(). |
| 620 | files_list = self.mox.CreateMockAnything() |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 621 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 622 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 623 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 624 | gclient_scm.scm.SVN._CaptureInfo( |
| 625 | [], join(self.base_path, '.')).AndReturn(file_info) |
| 626 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 627 | ).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 628 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 629 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 630 | ).AndReturn({'Revision': 100}) |
| 631 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 632 | self.mox.ReplayAll() |
| 633 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 634 | relpath=self.relpath) |
| 635 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 636 | self.checkstdout('\n_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 637 | |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 638 | def testUpdateGitSvn(self): |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 639 | options = self.Options(verbose=True) |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 640 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 641 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 642 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(True) |
| 643 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
| 644 | gclient_scm.scm.GIT.Capture(['config', '--local', '--get', |
| 645 | 'svn-remote.svn.url'], |
| 646 | cwd=self.base_path).AndReturn(self.url) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 647 | self.mox.ReplayAll() |
| 648 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 649 | relpath=self.relpath) |
| 650 | file_list = [] |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 651 | scm.update(options, [], file_list) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 652 | self.checkstdout( |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 653 | ('\n_____ %s looks like a git-svn checkout. Skipping.\n' % self.relpath) |
| 654 | ) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 655 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 656 | def testGetUsableRevSVN(self): |
| 657 | # pylint: disable=E1101 |
| 658 | options = self.Options(verbose=True) |
| 659 | |
| 660 | # Mock SVN revision validity checking. |
| 661 | self.mox.StubOutWithMock( |
| 662 | gclient_scm.scm.SVN, 'IsValidRevision', True) |
| 663 | gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 1) |
| 664 | ).AndReturn(True) |
| 665 | gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 'fake') |
| 666 | ).AndReturn(False) |
| 667 | |
| 668 | self.mox.ReplayAll() |
| 669 | |
| 670 | svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir) |
| 671 | # With an SVN checkout, 1 an example of a valid usable rev. |
| 672 | self.assertEquals(svn_scm.GetUsableRev(1, options), 1) |
| 673 | # With an SVN checkout, a fake or unknown rev should raise an excpetion. |
| 674 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 675 | svn_scm.GetUsableRev, 'fake', options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 676 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 677 | class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils, |
| 678 | unittest.TestCase): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 679 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 680 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 681 | def __init__(self, verbose=False, revision=None): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 682 | self.verbose = verbose |
| 683 | self.revision = revision |
| 684 | self.manually_grab_svn_rev = True |
| 685 | self.deps_os = None |
| 686 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 687 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 688 | self.nohooks = False |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 689 | self.upstream = False |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 690 | self.cache_dir = None |
bauerb@chromium.org | 4dd0937 | 2011-07-22 14:41:51 +0000 | [diff] [blame] | 691 | self.merge = False |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 692 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 693 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 694 | |
| 695 | sample_git_import = """blob |
| 696 | mark :1 |
| 697 | data 6 |
| 698 | Hello |
| 699 | |
| 700 | blob |
| 701 | mark :2 |
| 702 | data 4 |
| 703 | Bye |
| 704 | |
| 705 | reset refs/heads/master |
| 706 | commit refs/heads/master |
| 707 | mark :3 |
| 708 | author Bob <bob@example.com> 1253744361 -0700 |
| 709 | committer Bob <bob@example.com> 1253744361 -0700 |
| 710 | data 8 |
| 711 | A and B |
| 712 | M 100644 :1 a |
| 713 | M 100644 :2 b |
| 714 | |
| 715 | blob |
| 716 | mark :4 |
| 717 | data 10 |
| 718 | Hello |
| 719 | You |
| 720 | |
| 721 | blob |
| 722 | mark :5 |
| 723 | data 8 |
| 724 | Bye |
| 725 | You |
| 726 | |
| 727 | commit refs/heads/origin |
| 728 | mark :6 |
| 729 | author Alice <alice@example.com> 1253744424 -0700 |
| 730 | committer Alice <alice@example.com> 1253744424 -0700 |
| 731 | data 13 |
| 732 | Personalized |
| 733 | from :3 |
| 734 | M 100644 :4 a |
| 735 | M 100644 :5 b |
| 736 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 737 | blob |
| 738 | mark :7 |
| 739 | data 5 |
| 740 | Mooh |
| 741 | |
| 742 | commit refs/heads/feature |
| 743 | mark :8 |
| 744 | author Bob <bob@example.com> 1390311986 -0000 |
| 745 | committer Bob <bob@example.com> 1390311986 -0000 |
| 746 | data 6 |
| 747 | Add C |
| 748 | from :3 |
| 749 | M 100644 :7 c |
| 750 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 751 | reset refs/heads/master |
| 752 | from :3 |
| 753 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 754 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 755 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 756 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 757 | @staticmethod |
| 758 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 759 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 760 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 761 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 762 | cwd=path).communicate() |
| 763 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 764 | # git is not available, skip this test. |
| 765 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 766 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
| 767 | stderr=STDOUT, cwd=path).communicate(input=git_import) |
| 768 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 769 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 770 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 771 | stderr=STDOUT, cwd=path).communicate() |
| 772 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 773 | stderr=STDOUT, cwd=path).communicate() |
| 774 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
| 775 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 776 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 777 | stderr=STDOUT, cwd=path).communicate() |
iannucci@chromium.org | 1e7187a | 2013-02-17 20:54:05 +0000 | [diff] [blame] | 778 | Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE, |
| 779 | stderr=STDOUT, cwd=path).communicate() |
| 780 | Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE, |
| 781 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 782 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 783 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 784 | def _GetAskForDataCallback(self, expected_prompt, return_value): |
| 785 | def AskForData(prompt, options): |
| 786 | self.assertEquals(prompt, expected_prompt) |
| 787 | return return_value |
| 788 | return AskForData |
| 789 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 790 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 791 | TestCaseUtils.setUp(self) |
| 792 | unittest.TestCase.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 793 | self.url = 'git://foo' |
| 794 | self.root_dir = tempfile.mkdtemp() |
| 795 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 796 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 797 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 798 | StdoutCheck.setUp(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 799 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 800 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 801 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
| 802 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 803 | |
| 804 | def tearDown(self): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 805 | try: |
| 806 | rmtree(self.root_dir) |
| 807 | StdoutCheck.tearDown(self) |
| 808 | TestCaseUtils.tearDown(self) |
| 809 | unittest.TestCase.tearDown(self) |
| 810 | finally: |
| 811 | # TODO(maruel): Use auto_stub.TestCase. |
| 812 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
| 813 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 814 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 815 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 816 | class ManagedGitWrapperTestCase(BaseGitWrapperTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 817 | def testDir(self): |
| 818 | members = [ |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 819 | 'BinaryExists', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 820 | 'FullUrlForRelativeUrl', |
xusydoc@chromium.org | 885a960 | 2013-05-31 09:54:40 +0000 | [diff] [blame] | 821 | 'GetCheckoutRoot', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 822 | 'GetRevisionDate', |
| 823 | 'GetUsableRev', |
| 824 | 'RunCommand', |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 825 | 'cache_dir', |
| 826 | 'cache_locks', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 827 | 'cleanup', |
| 828 | 'diff', |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 829 | 'name', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 830 | 'pack', |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 831 | 'UpdateSubmoduleConfig', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 832 | 'relpath', |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 833 | 'remote', |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 834 | 'revert', |
| 835 | 'revinfo', |
| 836 | 'runhooks', |
| 837 | 'status', |
| 838 | 'update', |
| 839 | 'url', |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 840 | ] |
| 841 | |
| 842 | # If you add a member, be sure to add the relevant test! |
| 843 | self.compareMembers(gclient_scm.CreateSCM(url=self.url), members) |
| 844 | |
| 845 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 846 | if not self.enabled: |
| 847 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 848 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 849 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 850 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 851 | relpath=self.relpath) |
| 852 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 853 | scm.update(options, None, file_list) |
| 854 | gclient_scm.os.remove(file_path) |
| 855 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 856 | scm.revert(options, self.args, file_list) |
| 857 | self.assertEquals(file_list, [file_path]) |
| 858 | file_list = [] |
| 859 | scm.diff(options, self.args, file_list) |
| 860 | self.assertEquals(file_list, []) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 861 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 862 | |
| 863 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 864 | if not self.enabled: |
| 865 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 866 | options = self.Options() |
| 867 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 868 | relpath=self.relpath) |
| 869 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 870 | scm.update(options, None, file_list) |
| 871 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 872 | scm.revert(options, self.args, file_list) |
| 873 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 874 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 875 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 876 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 877 | |
| 878 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 879 | if not self.enabled: |
| 880 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 881 | options = self.Options() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 882 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 883 | relpath=self.relpath) |
| 884 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 885 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 886 | file_path = join(self.base_path, 'a') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 887 | open(file_path, 'a').writelines('touched\n') |
| 888 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 889 | scm.revert(options, self.args, file_list) |
| 890 | self.assertEquals(file_list, [file_path]) |
| 891 | file_list = [] |
| 892 | scm.diff(options, self.args, file_list) |
| 893 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 894 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 895 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 896 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 897 | |
| 898 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 899 | if not self.enabled: |
| 900 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 901 | options = self.Options() |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 902 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 903 | relpath=self.relpath) |
| 904 | file_list = [] |
| 905 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 906 | file_path = join(self.base_path, 'c') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 907 | f = open(file_path, 'w') |
| 908 | f.writelines('new\n') |
| 909 | f.close() |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 910 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 911 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 912 | file_list = [] |
| 913 | scm.revert(options, self.args, file_list) |
| 914 | self.assertEquals(file_list, [file_path]) |
| 915 | file_list = [] |
| 916 | scm.diff(options, self.args, file_list) |
| 917 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 918 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 919 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 920 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 921 | |
| 922 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 923 | if not self.enabled: |
| 924 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 925 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 926 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 927 | open(file_path, 'a').writelines('touched\n') |
| 928 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 929 | relpath=self.relpath) |
| 930 | file_list = [] |
| 931 | scm.status(options, self.args, file_list) |
| 932 | self.assertEquals(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 933 | self.checkstdout( |
| 934 | ('\n________ running \'git diff --name-status ' |
| 935 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 936 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 937 | |
| 938 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 939 | if not self.enabled: |
| 940 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 941 | options = self.Options() |
| 942 | expected_file_list = [] |
| 943 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 944 | file_path = join(self.base_path, f) |
| 945 | open(file_path, 'a').writelines('touched\n') |
| 946 | expected_file_list.extend([file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 947 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 948 | relpath=self.relpath) |
| 949 | file_list = [] |
| 950 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 951 | 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] | 952 | self.assertEquals(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 953 | self.checkstdout( |
| 954 | ('\n________ running \'git diff --name-status ' |
| 955 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 956 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 957 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 958 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 959 | if not self.enabled: |
| 960 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 961 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 962 | 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] | 963 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 964 | relpath=self.relpath) |
| 965 | file_list = [] |
| 966 | scm.update(options, (), file_list) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 967 | self.assertEquals(file_list, expected_file_list) |
| 968 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 969 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 970 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 971 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 972 | def testUpdateMerge(self): |
| 973 | if not self.enabled: |
| 974 | return |
| 975 | options = self.Options() |
| 976 | options.merge = True |
| 977 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 978 | relpath=self.relpath) |
| 979 | scm._Run(['checkout', '-q', 'feature'], options) |
| 980 | rev = scm.revinfo(options, (), None) |
| 981 | file_list = [] |
| 982 | scm.update(options, (), file_list) |
| 983 | self.assertEquals(file_list, [join(self.base_path, x) |
| 984 | for x in ['a', 'b', 'c']]) |
| 985 | # The actual commit that is created is unstable, so we verify its tree and |
| 986 | # parents instead. |
| 987 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 988 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 989 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^1']), rev) |
| 990 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^2']), |
| 991 | scm._Capture(['rev-parse', 'origin/master'])) |
| 992 | sys.stdout.close() |
| 993 | |
| 994 | def testUpdateRebase(self): |
| 995 | if not self.enabled: |
| 996 | return |
| 997 | options = self.Options() |
| 998 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 999 | relpath=self.relpath) |
| 1000 | scm._Run(['checkout', '-q', 'feature'], options) |
| 1001 | file_list = [] |
| 1002 | # Fake a 'y' key press. |
| 1003 | scm._AskForData = self._GetAskForDataCallback( |
| 1004 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 1005 | '(y)es / (q)uit / (s)kip : ', 'y') |
| 1006 | scm.update(options, (), file_list) |
| 1007 | self.assertEquals(file_list, [join(self.base_path, x) |
| 1008 | for x in ['a', 'b', 'c']]) |
| 1009 | # The actual commit that is created is unstable, so we verify its tree and |
| 1010 | # parent instead. |
| 1011 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 1012 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 1013 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^']), |
| 1014 | scm._Capture(['rev-parse', 'origin/master'])) |
| 1015 | sys.stdout.close() |
| 1016 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1017 | def testUpdateReset(self): |
| 1018 | if not self.enabled: |
| 1019 | return |
| 1020 | options = self.Options() |
| 1021 | options.reset = True |
| 1022 | |
| 1023 | dir_path = join(self.base_path, 'c') |
| 1024 | os.mkdir(dir_path) |
| 1025 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 1026 | |
| 1027 | file_path = join(self.base_path, 'file') |
| 1028 | open(file_path, 'w').writelines('new\n') |
| 1029 | |
| 1030 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1031 | relpath=self.relpath) |
| 1032 | file_list = [] |
| 1033 | scm.update(options, (), file_list) |
| 1034 | self.assert_(gclient_scm.os.path.isdir(dir_path)) |
| 1035 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1036 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1037 | |
| 1038 | def testUpdateResetDeleteUnversionedTrees(self): |
| 1039 | if not self.enabled: |
| 1040 | return |
| 1041 | options = self.Options() |
| 1042 | options.reset = True |
| 1043 | options.delete_unversioned_trees = True |
| 1044 | |
| 1045 | dir_path = join(self.base_path, 'dir') |
| 1046 | os.mkdir(dir_path) |
| 1047 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 1048 | |
| 1049 | file_path = join(self.base_path, 'file') |
| 1050 | open(file_path, 'w').writelines('new\n') |
| 1051 | |
| 1052 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1053 | relpath=self.relpath) |
| 1054 | file_list = [] |
| 1055 | scm.update(options, (), file_list) |
| 1056 | self.assert_(not gclient_scm.os.path.isdir(dir_path)) |
| 1057 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1058 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1059 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 1060 | def testUpdateUnstagedConflict(self): |
| 1061 | if not self.enabled: |
| 1062 | return |
| 1063 | options = self.Options() |
| 1064 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1065 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1066 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1067 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1068 | try: |
| 1069 | scm.update(options, (), []) |
| 1070 | self.fail() |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 1071 | except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1072 | # The exact exception text varies across git versions so it's not worth |
| 1073 | # verifying it. It's fine as long as it throws. |
| 1074 | pass |
| 1075 | # Manually flush stdout since we can't verify it's content accurately across |
| 1076 | # git versions. |
| 1077 | sys.stdout.getvalue() |
| 1078 | sys.stdout.close() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 1079 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1080 | def testUpdateConflict(self): |
| 1081 | if not self.enabled: |
| 1082 | return |
| 1083 | options = self.Options() |
| 1084 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1085 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1086 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1087 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1088 | scm._Run(['commit', '-am', 'test'], options) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 1089 | scm._AskForData = self._GetAskForDataCallback( |
| 1090 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 1091 | '(y)es / (q)uit / (s)kip : ', 'y') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1092 | exception = ('Conflict while rebasing this branch.\n' |
| 1093 | 'Fix the conflict and run gclient again.\n' |
| 1094 | 'See \'man git-rebase\' for details.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1095 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 1096 | exception = ('\n____ . at refs/remotes/origin/master\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1097 | '\tYou have unstaged changes.\n' |
| 1098 | '\tPlease commit, stash, or reset.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1099 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 1100 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1101 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1102 | def testRevinfo(self): |
| 1103 | if not self.enabled: |
| 1104 | return |
| 1105 | options = self.Options() |
| 1106 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1107 | relpath=self.relpath) |
| 1108 | rev_info = scm.revinfo(options, (), None) |
| 1109 | self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
| 1110 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1111 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1112 | class ManagedGitWrapperTestCaseMox(BaseTestCase): |
| 1113 | class OptionsObject(object): |
| 1114 | def __init__(self, verbose=False, revision=None, force=False): |
| 1115 | self.verbose = verbose |
| 1116 | self.revision = revision |
| 1117 | self.deps_os = None |
| 1118 | self.force = force |
| 1119 | self.reset = False |
| 1120 | self.nohooks = False |
| 1121 | # TODO(maruel): Test --jobs > 1. |
| 1122 | self.jobs = 1 |
| 1123 | |
| 1124 | def Options(self, *args, **kwargs): |
| 1125 | return self.OptionsObject(*args, **kwargs) |
| 1126 | |
| 1127 | def setUp(self): |
| 1128 | BaseTestCase.setUp(self) |
| 1129 | self.fake_hash_1 = 't0ta11yf4k3' |
| 1130 | self.fake_hash_2 = '3v3nf4k3r' |
| 1131 | self.url = 'git://foo' |
maruel@chromium.org | 9717013 | 2013-05-08 14:58:34 +0000 | [diff] [blame] | 1132 | self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1133 | self.relpath = 'fake' |
| 1134 | self.base_path = os.path.join(self.root_dir, self.relpath) |
| 1135 | |
| 1136 | def tearDown(self): |
| 1137 | BaseTestCase.tearDown(self) |
| 1138 | |
| 1139 | def testGetUsableRevGit(self): |
| 1140 | # pylint: disable=E1101 |
| 1141 | options = self.Options(verbose=True) |
| 1142 | |
| 1143 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 1144 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 1145 | ).AndReturn(True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1146 | |
| 1147 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 1148 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1149 | ).AndReturn(False) |
| 1150 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1151 | gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1152 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1153 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1154 | self.mox.ReplayAll() |
| 1155 | |
| 1156 | git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1157 | relpath=self.relpath) |
| 1158 | # A [fake] git sha1 with a git repo should work (this is in the case that |
| 1159 | # the LKGR gets flipped to git sha1's some day). |
| 1160 | self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options), |
| 1161 | self.fake_hash_1) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1162 | # 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] | 1163 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1164 | git_scm.GetUsableRev, '1', options) |
| 1165 | |
| 1166 | def testGetUsableRevGitSvn(self): |
| 1167 | # pylint: disable=E1101 |
| 1168 | options = self.Options() |
| 1169 | too_big = str(1e7) |
| 1170 | |
| 1171 | # Pretend like the git-svn repo's HEAD is at r2. |
| 1172 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'GetGitSvnHeadRev', True) |
| 1173 | gclient_scm.scm.GIT.GetGitSvnHeadRev(cwd=self.base_path).MultipleTimes( |
| 1174 | ).AndReturn(2) |
| 1175 | |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1176 | self.mox.StubOutWithMock( |
| 1177 | gclient_scm.scm.GIT, 'GetBlessedSha1ForSvnRev', True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1178 | # r1 -> first fake hash, r3 -> second fake hash. |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1179 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='1' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1180 | ).AndReturn(self.fake_hash_1) |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1181 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='3' |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1182 | ).MultipleTimes().AndReturn(self.fake_hash_2) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1183 | |
| 1184 | # Ensure that we call git svn fetch if our LKGR is > the git-svn HEAD rev. |
| 1185 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1186 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 1187 | cwd=self.base_path).AndReturn('blah') |
| 1188 | gclient_scm.scm.GIT.Capture(['fetch'], cwd=self.base_path) |
| 1189 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
| 1190 | error = subprocess2.CalledProcessError(1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 1191 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 1192 | cwd=self.base_path).AndRaise(error) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1193 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1194 | gclient_scm.scm.GIT.Capture(['fetch', 'origin'], cwd=self.base_path) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1195 | |
| 1196 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
borenet@google.com | 6ff5448 | 2014-02-26 23:09:33 +0000 | [diff] [blame^] | 1197 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1198 | ).AndReturn(True) |
| 1199 | |
| 1200 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 1201 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 1202 | ).AndReturn(True) |
| 1203 | 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] | 1204 | ).MultipleTimes(2).AndReturn(False) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1205 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1206 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
| 1207 | gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True) |
| 1208 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1209 | self.mox.ReplayAll() |
| 1210 | |
| 1211 | git_svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1212 | relpath=self.relpath) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1213 | # Without an existing checkout, this should fail. |
| 1214 | # TODO(dbeam) Fix this. http://crbug.com/109184 |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1215 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1216 | git_svn_scm.GetUsableRev, '1', options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1217 | # Given an SVN revision with a git-svn checkout, it should be translated to |
| 1218 | # a git sha1 and be usable. |
| 1219 | self.assertEquals(git_svn_scm.GetUsableRev('1', options), |
| 1220 | self.fake_hash_1) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1221 | # Our fake HEAD rev is r2, so this should call git fetch and git svn fetch |
| 1222 | # to get more revs (pymox will complain if this doesn't happen). We mock an |
| 1223 | # optimized checkout the first time, so this run should call git fetch. |
| 1224 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 1225 | self.fake_hash_2) |
| 1226 | # 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] | 1227 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 1228 | self.fake_hash_2) |
| 1229 | # Given a git sha1 with a git-svn checkout, it should be used as is. |
| 1230 | self.assertEquals(git_svn_scm.GetUsableRev(self.fake_hash_1, options), |
| 1231 | self.fake_hash_1) |
| 1232 | # We currently check for seemingly valid SVN revisions by assuming 6 digit |
| 1233 | # numbers, so assure that numeric revs >= 1000000 don't work. |
| 1234 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1235 | git_svn_scm.GetUsableRev, too_big, options) |
| 1236 | |
| 1237 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1238 | class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase): |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1239 | def testUpdateUpdate(self): |
| 1240 | if not self.enabled: |
| 1241 | return |
| 1242 | options = self.Options() |
| 1243 | expected_file_list = [] |
| 1244 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1245 | relpath=self.relpath) |
| 1246 | file_list = [] |
| 1247 | options.revision = 'unmanaged' |
| 1248 | scm.update(options, (), file_list) |
| 1249 | self.assertEquals(file_list, expected_file_list) |
| 1250 | self.assertEquals(scm.revinfo(options, (), None), |
| 1251 | '069c602044c5388d2d15c3f875b057c852003458') |
| 1252 | self.checkstdout('________ unmanaged solution; skipping .\n') |
| 1253 | |
| 1254 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1255 | if __name__ == '__main__': |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1256 | if '-v' in sys.argv: |
| 1257 | logging.basicConfig( |
| 1258 | level=logging.DEBUG, |
| 1259 | format='%(asctime).19s %(levelname)s %(filename)s:' |
| 1260 | '%(lineno)s %(message)s') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1261 | unittest.main() |
| 1262 | |
| 1263 | # vim: ts=2:sw=2:tw=80:et: |