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