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