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