git_cl_test.py 113 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118211921202121212221232124212521262127212821292130213121322133213421352136213721382139214021412142214321442145214621472148214921502151215221532154215521562157215821592160216121622163216421652166216721682169217021712172217321742175217621772178217921802181218221832184218521862187218821892190219121922193219421952196219721982199220022012202220322042205220622072208220922102211221222132214221522162217221822192220222122222223222422252226222722282229223022312232223322342235223622372238223922402241224222432244224522462247224822492250225122522253225422552256225722582259226022612262226322642265226622672268226922702271227222732274227522762277227822792280228122822283228422852286228722882289229022912292229322942295229622972298229923002301230223032304230523062307230823092310231123122313231423152316231723182319232023212322232323242325232623272328232923302331233223332334233523362337233823392340234123422343234423452346234723482349235023512352235323542355235623572358235923602361236223632364236523662367236823692370237123722373237423752376237723782379238023812382238323842385238623872388238923902391239223932394239523962397239823992400240124022403240424052406240724082409241024112412241324142415241624172418241924202421242224232424242524262427242824292430243124322433243424352436243724382439244024412442244324442445244624472448244924502451245224532454245524562457245824592460246124622463246424652466246724682469247024712472247324742475247624772478247924802481248224832484248524862487248824892490249124922493249424952496249724982499250025012502250325042505250625072508250925102511251225132514251525162517251825192520252125222523252425252526252725282529253025312532253325342535253625372538253925402541254225432544254525462547254825492550255125522553255425552556255725582559256025612562256325642565256625672568256925702571257225732574257525762577257825792580258125822583258425852586258725882589259025912592259325942595259625972598259926002601260226032604260526062607260826092610261126122613261426152616261726182619262026212622262326242625262626272628262926302631263226332634263526362637263826392640264126422643264426452646264726482649265026512652265326542655265626572658265926602661266226632664266526662667266826692670267126722673267426752676267726782679268026812682268326842685268626872688268926902691269226932694269526962697269826992700270127022703270427052706270727082709271027112712271327142715271627172718271927202721272227232724272527262727272827292730273127322733273427352736273727382739274027412742274327442745274627472748274927502751275227532754275527562757275827592760276127622763276427652766276727682769277027712772277327742775277627772778277927802781278227832784278527862787278827892790279127922793279427952796279727982799280028012802280328042805280628072808280928102811281228132814281528162817281828192820282128222823282428252826282728282829283028312832283328342835283628372838283928402841284228432844284528462847284828492850285128522853285428552856285728582859286028612862286328642865286628672868286928702871287228732874287528762877287828792880288128822883288428852886288728882889289028912892289328942895289628972898289929002901290229032904290529062907290829092910291129122913
  1. #!/usr/bin/env python
  2. # Copyright (c) 2012 The Chromium Authors. All rights reserved.
  3. # Use of this source code is governed by a BSD-style license that can be
  4. # found in the LICENSE file.
  5. """Unit tests for git_cl.py."""
  6. import contextlib
  7. import json
  8. import os
  9. import StringIO
  10. import sys
  11. import unittest
  12. import urlparse
  13. sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
  14. from testing_support.auto_stub import TestCase
  15. import git_cl
  16. import git_common
  17. import git_footers
  18. import subprocess2
  19. def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
  20. return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
  21. CERR1 = callError(1)
  22. class ChangelistMock(object):
  23. # A class variable so we can access it when we don't have access to the
  24. # instance that's being set.
  25. desc = ""
  26. def __init__(self, **kwargs):
  27. pass
  28. def GetIssue(self):
  29. return 1
  30. def GetDescription(self):
  31. return ChangelistMock.desc
  32. def UpdateDescription(self, desc, force=False):
  33. ChangelistMock.desc = desc
  34. class PresubmitMock(object):
  35. def __init__(self, *args, **kwargs):
  36. self.reviewers = []
  37. @staticmethod
  38. def should_continue():
  39. return True
  40. class RietveldMock(object):
  41. def __init__(self, *args, **kwargs):
  42. pass
  43. @staticmethod
  44. def get_description(issue):
  45. return 'Issue: %d' % issue
  46. @staticmethod
  47. def get_issue_properties(_issue, _messages):
  48. return {
  49. 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
  50. 'messages': [
  51. {
  52. 'approval': True,
  53. 'sender': 'john@chromium.org',
  54. },
  55. ],
  56. 'patchsets': [1, 20001],
  57. }
  58. @staticmethod
  59. def close_issue(_issue):
  60. return 'Closed'
  61. @staticmethod
  62. def get_patch(issue, patchset):
  63. return 'patch set from issue %s patchset %s' % (issue, patchset)
  64. @staticmethod
  65. def update_description(_issue, _description):
  66. return 'Updated'
  67. @staticmethod
  68. def add_comment(_issue, _comment):
  69. return 'Commented'
  70. class GitCheckoutMock(object):
  71. def __init__(self, *args, **kwargs):
  72. pass
  73. @staticmethod
  74. def reset():
  75. GitCheckoutMock.conflict = False
  76. def apply_patch(self, p):
  77. if GitCheckoutMock.conflict:
  78. raise Exception('failed')
  79. class WatchlistsMock(object):
  80. def __init__(self, _):
  81. pass
  82. @staticmethod
  83. def GetWatchersForPaths(_):
  84. return ['joe@example.com']
  85. class CodereviewSettingsFileMock(object):
  86. def __init__(self):
  87. pass
  88. # pylint: disable=R0201
  89. def read(self):
  90. return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
  91. "GERRIT_HOST: True\n")
  92. class AuthenticatorMock(object):
  93. def __init__(self, *_args):
  94. pass
  95. def has_cached_credentials(self):
  96. return True
  97. def authorize(self, http):
  98. return http
  99. def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
  100. """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
  101. Usage:
  102. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  103. CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
  104. OR
  105. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  106. CookiesAuthenticatorMockFactory(cookie='cookie'))
  107. """
  108. class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
  109. def __init__(self): # pylint: disable=W0231
  110. # Intentionally not calling super() because it reads actual cookie files.
  111. pass
  112. @classmethod
  113. def get_gitcookies_path(cls):
  114. return '~/.gitcookies'
  115. @classmethod
  116. def get_netrc_path(cls):
  117. return '~/.netrc'
  118. def get_auth_header(self, host):
  119. if same_cookie:
  120. return same_cookie
  121. return (hosts_with_creds or {}).get(host)
  122. return CookiesAuthenticatorMock
  123. class MockChangelistWithBranchAndIssue():
  124. def __init__(self, branch, issue):
  125. self.branch = branch
  126. self.issue = issue
  127. def GetBranch(self):
  128. return self.branch
  129. def GetIssue(self):
  130. return self.issue
  131. class SystemExitMock(Exception):
  132. pass
  133. class TestGitClBasic(unittest.TestCase):
  134. def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
  135. parsed = urlparse.urlparse(url)
  136. result = func(parsed)
  137. if fail:
  138. self.assertIsNone(result)
  139. return None
  140. self.assertIsNotNone(result)
  141. self.assertEqual(result.issue, issue)
  142. self.assertEqual(result.patchset, patchset)
  143. self.assertEqual(result.hostname, hostname)
  144. return result
  145. def test_ParseIssueURL_rietveld(self):
  146. def test(url, issue=None, patchset=None, hostname=None, fail=None):
  147. self._test_ParseIssueUrl(
  148. git_cl._RietveldChangelistImpl.ParseIssueURL,
  149. url, issue, patchset, hostname, fail)
  150. test('http://codereview.chromium.org/123',
  151. 123, None, 'codereview.chromium.org')
  152. test('https://codereview.chromium.org/123',
  153. 123, None, 'codereview.chromium.org')
  154. test('https://codereview.chromium.org/123/',
  155. 123, None, 'codereview.chromium.org')
  156. test('https://codereview.chromium.org/123/whatever',
  157. 123, None, 'codereview.chromium.org')
  158. test('https://codereview.chromium.org/123/#ps20001',
  159. 123, 20001, 'codereview.chromium.org')
  160. test('http://codereview.chromium.org/download/issue123_4.diff',
  161. 123, 4, 'codereview.chromium.org')
  162. # This looks like bad Gerrit, but is actually valid Rietveld.
  163. test('https://chrome-review.source.com/123/4/',
  164. 123, None, 'chrome-review.source.com')
  165. test('https://codereview.chromium.org/deadbeaf', fail=True)
  166. test('https://codereview.chromium.org/api/123', fail=True)
  167. test('bad://codereview.chromium.org/123', fail=True)
  168. test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
  169. def test_ParseIssueURL_gerrit(self):
  170. def test(url, issue=None, patchset=None, hostname=None, fail=None):
  171. self._test_ParseIssueUrl(
  172. git_cl._GerritChangelistImpl.ParseIssueURL,
  173. url, issue, patchset, hostname, fail)
  174. test('http://chrome-review.source.com/c/123',
  175. 123, None, 'chrome-review.source.com')
  176. test('https://chrome-review.source.com/c/123/',
  177. 123, None, 'chrome-review.source.com')
  178. test('https://chrome-review.source.com/c/123/4',
  179. 123, 4, 'chrome-review.source.com')
  180. test('https://chrome-review.source.com/#/c/123/4',
  181. 123, 4, 'chrome-review.source.com')
  182. test('https://chrome-review.source.com/c/123/4',
  183. 123, 4, 'chrome-review.source.com')
  184. test('https://chrome-review.source.com/123',
  185. 123, None, 'chrome-review.source.com')
  186. test('https://chrome-review.source.com/123/4',
  187. 123, 4, 'chrome-review.source.com')
  188. test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
  189. test('https://chrome-review.source.com/c/abc/', fail=True)
  190. test('ssh://chrome-review.source.com/c/123/1/', fail=True)
  191. def test_ParseIssueNumberArgument(self):
  192. def test(arg, issue=None, patchset=None, hostname=None, fail=False):
  193. result = git_cl.ParseIssueNumberArgument(arg)
  194. self.assertIsNotNone(result)
  195. if fail:
  196. self.assertFalse(result.valid)
  197. else:
  198. self.assertEqual(result.issue, issue)
  199. self.assertEqual(result.patchset, patchset)
  200. self.assertEqual(result.hostname, hostname)
  201. test('123', 123)
  202. test('', fail=True)
  203. test('abc', fail=True)
  204. test('123/1', fail=True)
  205. test('123a', fail=True)
  206. test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
  207. # Rietveld.
  208. test('https://codereview.source.com/123',
  209. 123, None, 'codereview.source.com')
  210. test('https://codereview.source.com/www123', fail=True)
  211. # Gerrrit.
  212. test('https://chrome-review.source.com/c/123/4',
  213. 123, 4, 'chrome-review.source.com')
  214. test('https://chrome-review.source.com/bad/123/4', fail=True)
  215. def test_get_bug_line_values(self):
  216. f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
  217. self.assertEqual(f('', ''), [])
  218. self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
  219. self.assertEqual(f('v8', '456'), ['v8:456'])
  220. self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
  221. # Not nice, but not worth carying.
  222. self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
  223. ['v8:456', 'chromium:123', 'v8:123'])
  224. def _test_git_number(self, parent_msg, dest_ref, child_msg,
  225. parent_hash='parenthash'):
  226. desc = git_cl.ChangeDescription(child_msg)
  227. desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
  228. return desc.description
  229. def assertEqualByLine(self, actual, expected):
  230. self.assertEqual(actual.splitlines(), expected.splitlines())
  231. def test_git_number_bad_parent(self):
  232. with self.assertRaises(ValueError):
  233. self._test_git_number('Parent', 'refs/heads/master', 'Child')
  234. def test_git_number_bad_parent_footer(self):
  235. with self.assertRaises(AssertionError):
  236. self._test_git_number(
  237. 'Parent\n'
  238. '\n'
  239. 'Cr-Commit-Position: wrong',
  240. 'refs/heads/master', 'Child')
  241. def test_git_number_bad_lineage_ignored(self):
  242. actual = self._test_git_number(
  243. 'Parent\n'
  244. '\n'
  245. 'Cr-Commit-Position: refs/heads/master@{#1}\n'
  246. 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
  247. 'refs/heads/master', 'Child')
  248. self.assertEqualByLine(
  249. actual,
  250. 'Child\n'
  251. '\n'
  252. 'Cr-Commit-Position: refs/heads/master@{#2}\n'
  253. 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
  254. def test_git_number_same_branch(self):
  255. actual = self._test_git_number(
  256. 'Parent\n'
  257. '\n'
  258. 'Cr-Commit-Position: refs/heads/master@{#12}',
  259. dest_ref='refs/heads/master',
  260. child_msg='Child')
  261. self.assertEqualByLine(
  262. actual,
  263. 'Child\n'
  264. '\n'
  265. 'Cr-Commit-Position: refs/heads/master@{#13}')
  266. def test_git_number_same_branch_with_originals(self):
  267. actual = self._test_git_number(
  268. 'Parent\n'
  269. '\n'
  270. 'Cr-Commit-Position: refs/heads/master@{#12}',
  271. dest_ref='refs/heads/master',
  272. child_msg='Child\n'
  273. '\n'
  274. 'Some users are smart and insert their own footers\n'
  275. '\n'
  276. 'Cr-Whatever: value\n'
  277. 'Cr-Commit-Position: refs/copy/paste@{#22}')
  278. self.assertEqualByLine(
  279. actual,
  280. 'Child\n'
  281. '\n'
  282. 'Some users are smart and insert their own footers\n'
  283. '\n'
  284. 'Cr-Original-Whatever: value\n'
  285. 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
  286. 'Cr-Commit-Position: refs/heads/master@{#13}')
  287. def test_git_number_new_branch(self):
  288. actual = self._test_git_number(
  289. 'Parent\n'
  290. '\n'
  291. 'Cr-Commit-Position: refs/heads/master@{#12}',
  292. dest_ref='refs/heads/branch',
  293. child_msg='Child')
  294. self.assertEqualByLine(
  295. actual,
  296. 'Child\n'
  297. '\n'
  298. 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
  299. 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
  300. def test_git_number_lineage(self):
  301. actual = self._test_git_number(
  302. 'Parent\n'
  303. '\n'
  304. 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
  305. 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
  306. dest_ref='refs/heads/branch',
  307. child_msg='Child')
  308. self.assertEqualByLine(
  309. actual,
  310. 'Child\n'
  311. '\n'
  312. 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
  313. 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
  314. def test_git_number_moooooooore_lineage(self):
  315. actual = self._test_git_number(
  316. 'Parent\n'
  317. '\n'
  318. 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
  319. 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
  320. dest_ref='refs/heads/mooore',
  321. child_msg='Child')
  322. self.assertEqualByLine(
  323. actual,
  324. 'Child\n'
  325. '\n'
  326. 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
  327. 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
  328. 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
  329. def test_git_number_ever_moooooooore_lineage(self):
  330. self.maxDiff = 10000
  331. actual = self._test_git_number(
  332. 'CQ commit on fresh new branch + numbering.\n'
  333. '\n'
  334. 'NOTRY=True\n'
  335. 'NOPRESUBMIT=True\n'
  336. 'BUG=\n'
  337. '\n'
  338. 'Review-Url: https://codereview.chromium.org/2577703003\n'
  339. 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
  340. 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
  341. 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
  342. dest_ref='refs/heads/gnumb-test/cl',
  343. child_msg='git cl on fresh new branch + numbering.\n'
  344. '\n'
  345. 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
  346. self.assertEqualByLine(
  347. actual,
  348. 'git cl on fresh new branch + numbering.\n'
  349. '\n'
  350. 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
  351. 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
  352. 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
  353. 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
  354. 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
  355. def test_git_number_cherry_pick(self):
  356. actual = self._test_git_number(
  357. 'Parent\n'
  358. '\n'
  359. 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
  360. 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
  361. dest_ref='refs/heads/branch',
  362. child_msg='Child, which is cherry-pick from master\n'
  363. '\n'
  364. 'Cr-Commit-Position: refs/heads/master@{#100}\n'
  365. '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
  366. self.assertEqualByLine(
  367. actual,
  368. 'Child, which is cherry-pick from master\n'
  369. '\n'
  370. '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
  371. '\n'
  372. 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
  373. 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
  374. 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
  375. class TestGitCl(TestCase):
  376. def setUp(self):
  377. super(TestGitCl, self).setUp()
  378. self.calls = []
  379. self._calls_done = []
  380. self.mock(subprocess2, 'call', self._mocked_call)
  381. self.mock(subprocess2, 'check_call', self._mocked_call)
  382. self.mock(subprocess2, 'check_output', self._mocked_call)
  383. self.mock(subprocess2, 'communicate',
  384. lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
  385. self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
  386. self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
  387. self.mock(git_common, 'get_or_create_merge_base',
  388. lambda *a: (
  389. self._mocked_call(['get_or_create_merge_base']+list(a))))
  390. self.mock(git_cl, 'BranchExists', lambda _: True)
  391. self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
  392. self.mock(git_cl, 'ask_for_data', self._mocked_call)
  393. self.mock(git_cl, 'write_json', lambda path, contents:
  394. self._mocked_call('write_json', path, contents))
  395. self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
  396. self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
  397. self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
  398. self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
  399. GitCheckoutMock.reset()
  400. self.mock(git_cl.upload, 'RealMain', self.fail)
  401. self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
  402. self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
  403. self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
  404. classmethod(lambda _: False))
  405. self.mock(git_cl, 'DieWithError',
  406. lambda msg: self._mocked_call(['DieWithError', msg]))
  407. # It's important to reset settings to not have inter-tests interference.
  408. git_cl.settings = None
  409. def tearDown(self):
  410. try:
  411. # Note: has_failed returns True if at least 1 test ran so far, current
  412. # included, has failed. That means current test may have actually ran
  413. # fine, and the check for no leftover calls would be skipped.
  414. if not self.has_failed():
  415. self.assertEquals([], self.calls)
  416. finally:
  417. super(TestGitCl, self).tearDown()
  418. def _mocked_call(self, *args, **_kwargs):
  419. self.assertTrue(
  420. self.calls,
  421. '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
  422. top = self.calls.pop(0)
  423. expected_args, result = top
  424. # Also logs otherwise it could get caught in a try/finally and be hard to
  425. # diagnose.
  426. if expected_args != args:
  427. N = 5
  428. prior_calls = '\n '.join(
  429. '@%d: %r' % (len(self._calls_done) - N + i, c[0])
  430. for i, c in enumerate(self._calls_done[-N:]))
  431. following_calls = '\n '.join(
  432. '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
  433. for i, c in enumerate(self.calls[:N]))
  434. extended_msg = (
  435. 'A few prior calls:\n %s\n\n'
  436. 'This (expected):\n @%d: %r\n'
  437. 'This (actual):\n @%d: %r\n\n'
  438. 'A few following expected calls:\n %s' %
  439. (prior_calls, len(self._calls_done), expected_args,
  440. len(self._calls_done), args, following_calls))
  441. git_cl.logging.error(extended_msg)
  442. self.fail('@%d\n'
  443. ' Expected: %r\n'
  444. ' Actual: %r' % (
  445. len(self._calls_done), expected_args, args))
  446. self._calls_done.append(top)
  447. if isinstance(result, Exception):
  448. raise result
  449. return result
  450. def test_LoadCodereviewSettingsFromFile_gerrit(self):
  451. codereview_file = StringIO.StringIO('GERRIT_HOST: true')
  452. self.calls = [
  453. ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
  454. ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
  455. ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
  456. ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
  457. ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
  458. ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
  459. ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
  460. CERR1),
  461. ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
  462. CERR1),
  463. ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
  464. ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
  465. CERR1),
  466. ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
  467. CERR1),
  468. ((['git', 'config', 'gerrit.host', 'true'],), ''),
  469. ]
  470. self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
  471. @classmethod
  472. def _is_gerrit_calls(cls, gerrit=False):
  473. return [((['git', 'config', 'rietveld.autoupdate'],), ''),
  474. ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
  475. @classmethod
  476. def _upload_calls(cls, similarity, find_copies, private):
  477. return (cls._git_base_calls(similarity, find_copies) +
  478. cls._git_upload_calls(private))
  479. @classmethod
  480. def _upload_no_rev_calls(cls, similarity, find_copies):
  481. return (cls._git_base_calls(similarity, find_copies) +
  482. cls._git_upload_no_rev_calls())
  483. @classmethod
  484. def _git_base_calls(cls, similarity, find_copies):
  485. if similarity is None:
  486. similarity = '50'
  487. similarity_call = ((['git', 'config',
  488. 'branch.master.git-cl-similarity'],), CERR1)
  489. else:
  490. similarity_call = ((['git', 'config',
  491. 'branch.master.git-cl-similarity', similarity],), '')
  492. if find_copies is None:
  493. find_copies = True
  494. find_copies_call = ((['git', 'config', '--bool',
  495. 'branch.master.git-find-copies'],), CERR1)
  496. else:
  497. val = str(find_copies).lower()
  498. find_copies_call = ((['git', 'config', '--bool',
  499. 'branch.master.git-find-copies', val],), '')
  500. if find_copies:
  501. stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
  502. '-l100000', '-C'+similarity,
  503. 'fake_ancestor_sha', 'HEAD'],), '+dat')
  504. else:
  505. stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
  506. '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
  507. return [
  508. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  509. similarity_call,
  510. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  511. find_copies_call,
  512. ] + cls._is_gerrit_calls() + [
  513. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  514. ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
  515. ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
  516. ((['git', 'config', 'rietveld.server'],),
  517. 'codereview.example.com'),
  518. ((['git', 'config', 'branch.master.merge'],), 'master'),
  519. ((['git', 'config', 'branch.master.remote'],), 'origin'),
  520. ((['get_or_create_merge_base', 'master', 'master'],),
  521. 'fake_ancestor_sha'),
  522. ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
  523. ((['git', 'rev-parse', '--show-cdup'],), ''),
  524. ((['git', 'rev-parse', 'HEAD'],), '12345'),
  525. ((['git', 'diff', '--name-status', '--no-renames', '-r',
  526. 'fake_ancestor_sha...', '.'],),
  527. 'M\t.gitignore\n'),
  528. ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
  529. ((['git', 'log', '--pretty=format:%s%n%n%b',
  530. 'fake_ancestor_sha...'],),
  531. 'foo'),
  532. ((['git', 'config', 'user.email'],), 'me@example.com'),
  533. stat_call,
  534. ((['git', 'log', '--pretty=format:%s\n\n%b',
  535. 'fake_ancestor_sha..HEAD'],),
  536. 'desc\n'),
  537. ((['git', 'config', 'rietveld.bug-prefix'],), ''),
  538. ]
  539. @classmethod
  540. def _git_upload_no_rev_calls(cls):
  541. return [
  542. ((['git', 'config', 'core.editor'],), ''),
  543. ]
  544. @classmethod
  545. def _git_upload_calls(cls, private):
  546. if private:
  547. cc_call = []
  548. private_call = []
  549. else:
  550. cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
  551. private_call = [
  552. ((['git', 'config', 'rietveld.private'],), '')]
  553. return [
  554. ((['git', 'config', 'core.editor'],), ''),
  555. ] + cc_call + private_call + [
  556. ((['git', 'config', 'branch.master.base-url'],), ''),
  557. ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
  558. ((['git',
  559. 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
  560. (('', None), 0)),
  561. ((['git', 'rev-parse', '--show-cdup'],), ''),
  562. ((['git', 'svn', 'info'],), ''),
  563. ((['git', 'config', 'rietveld.project'],), ''),
  564. ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
  565. ((['git', 'config', 'branch.master.rietveldserver',
  566. 'https://codereview.example.com'],), ''),
  567. ((['git',
  568. 'config', 'branch.master.rietveldpatchset', '2'],), ''),
  569. ] + cls._git_post_upload_calls()
  570. @classmethod
  571. def _git_post_upload_calls(cls):
  572. return [
  573. ((['git', 'rev-parse', 'HEAD'],), 'hash'),
  574. ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
  575. ((['git',
  576. 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
  577. ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
  578. ]
  579. @staticmethod
  580. def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
  581. fake_ancestor = 'fake_ancestor'
  582. fake_cl = 'fake_cl_for_patch'
  583. return [
  584. ((['git',
  585. 'rev-parse', '--verify', diff_base],), fake_ancestor),
  586. ((['git',
  587. 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
  588. ((['git',
  589. 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
  590. # Mock a config miss (error code 1)
  591. ((['git',
  592. 'config', 'gitcl.remotebranch'],), CERR1),
  593. ] + ([
  594. # Call to GetRemoteBranch()
  595. ((['git',
  596. 'config', 'branch.%s.merge' % working_branch],),
  597. 'refs/heads/master'),
  598. ((['git',
  599. 'config', 'branch.%s.remote' % working_branch],), 'origin'),
  600. ] if get_remote_branch else []) + [
  601. ((['git', 'rev-list', '^' + fake_ancestor,
  602. 'refs/remotes/origin/master'],), ''),
  603. ]
  604. @classmethod
  605. def _dcommit_calls_1(cls):
  606. return [
  607. ((['git', 'config', 'rietveld.autoupdate'],),
  608. ''),
  609. ((['git', 'config', 'rietveld.pending-ref-prefix'],),
  610. ''),
  611. ((['git',
  612. 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
  613. ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
  614. 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
  615. None),
  616. 0)),
  617. ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
  618. ((['git', 'config',
  619. 'branch.working.git-cl-similarity'],), CERR1),
  620. ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
  621. ((['git', 'config', '--bool',
  622. 'branch.working.git-find-copies'],), CERR1),
  623. ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
  624. ((['git',
  625. 'config', 'branch.working.rietveldissue'],), '12345'),
  626. ((['git',
  627. 'config', 'rietveld.server'],), 'codereview.example.com'),
  628. ((['git',
  629. 'config', 'branch.working.merge'],), 'refs/heads/master'),
  630. ((['git', 'config', 'branch.working.remote'],), 'origin'),
  631. ((['git', 'config', 'branch.working.merge'],),
  632. 'refs/heads/master'),
  633. ((['git', 'config', 'branch.working.remote'],), 'origin'),
  634. ((['git', 'rev-list', '--merges',
  635. '--grep=^SVN changes up to revision [0-9]*$',
  636. 'refs/remotes/origin/master^!'],), ''),
  637. ((['git', 'rev-list', '^refs/heads/working',
  638. 'refs/remotes/origin/master'],),
  639. ''),
  640. ((['git',
  641. 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
  642. '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
  643. ((['git',
  644. 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
  645. 'refs/remotes/origin/master'],), ''),
  646. ((['git',
  647. 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
  648. 'fake_ancestor_sha'),
  649. ]
  650. @classmethod
  651. def _dcommit_calls_normal(cls):
  652. return [
  653. ((['git', 'rev-parse', '--show-cdup'],), ''),
  654. ((['git', 'rev-parse', 'HEAD'],),
  655. '00ff397798ea57439712ed7e04ab96e13969ef40'),
  656. ((['git',
  657. 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
  658. '.'],),
  659. 'M\tPRESUBMIT.py'),
  660. ((['git',
  661. 'config', 'branch.working.rietveldpatchset'],), '31137'),
  662. ((['git', 'config', 'branch.working.rietveldserver'],),
  663. 'codereview.example.com'),
  664. ((['git', 'config', 'user.email'],), 'author@example.com'),
  665. ((['git', 'config', 'rietveld.tree-status-url'],), ''),
  666. ]
  667. @classmethod
  668. def _dcommit_calls_bypassed(cls):
  669. return [
  670. ((['git', 'config', 'branch.working.rietveldserver'],),
  671. 'codereview.example.com'),
  672. ]
  673. @classmethod
  674. def _dcommit_calls_3(cls):
  675. return [
  676. ((['git',
  677. 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
  678. 'fake_ancestor_sha', 'refs/heads/working'],),
  679. (' PRESUBMIT.py | 2 +-\n'
  680. ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
  681. ((['git', 'show-ref', '--quiet', '--verify',
  682. 'refs/heads/git-cl-commit'],), ''),
  683. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  684. ((['git', 'show-ref', '--quiet', '--verify',
  685. 'refs/heads/git-cl-cherry-pick'],), CERR1),
  686. ((['git', 'rev-parse', '--show-cdup'],), '\n'),
  687. ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
  688. ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
  689. ((['git', 'commit', '-m',
  690. 'Issue: 12345\n\nR=john@chromium.org\n\n'
  691. 'Review-Url: https://codereview.example.com/12345 .'],),
  692. ''),
  693. ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
  694. ((['git',
  695. 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
  696. (('', None), 0)),
  697. ((['git', 'checkout', '-q', 'working'],), ''),
  698. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  699. ]
  700. @staticmethod
  701. def _cmd_line(description, args, similarity, find_copies, private, cc):
  702. """Returns the upload command line passed to upload.RealMain()."""
  703. return [
  704. 'upload', '--assume_yes', '--server',
  705. 'https://codereview.example.com',
  706. '--message', description
  707. ] + args + [
  708. '--cc', ','.join(['joe@example.com'] + cc),
  709. ] + (['--private'] if private else []) + [
  710. '--git_similarity', similarity or '50'
  711. ] + (['--git_no_find_copies'] if find_copies == False else []) + [
  712. 'fake_ancestor_sha', 'HEAD'
  713. ]
  714. def _run_reviewer_test(
  715. self,
  716. upload_args,
  717. expected_description,
  718. returned_description,
  719. final_description,
  720. reviewers,
  721. private=False,
  722. cc=None):
  723. """Generic reviewer test framework."""
  724. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  725. try:
  726. similarity = upload_args[upload_args.index('--similarity')+1]
  727. except ValueError:
  728. similarity = None
  729. if '--find-copies' in upload_args:
  730. find_copies = True
  731. elif '--no-find-copies' in upload_args:
  732. find_copies = False
  733. else:
  734. find_copies = None
  735. private = '--private' in upload_args
  736. cc = cc or []
  737. self.calls = self._upload_calls(similarity, find_copies, private)
  738. def RunEditor(desc, _, **kwargs):
  739. self.assertEquals(
  740. '# Enter a description of the change.\n'
  741. '# This will be displayed on the codereview site.\n'
  742. '# The first line will also be used as the subject of the review.\n'
  743. '#--------------------This line is 72 characters long'
  744. '--------------------\n' +
  745. expected_description,
  746. desc)
  747. return returned_description
  748. self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
  749. def check_upload(args):
  750. cmd_line = self._cmd_line(final_description, reviewers, similarity,
  751. find_copies, private, cc)
  752. self.assertEquals(cmd_line, args)
  753. return 1, 2
  754. self.mock(git_cl.upload, 'RealMain', check_upload)
  755. git_cl.main(['upload'] + upload_args)
  756. def test_no_reviewer(self):
  757. self._run_reviewer_test(
  758. [],
  759. 'desc\n\nBUG=',
  760. '# Blah blah comment.\ndesc\n\nBUG=',
  761. 'desc\n\nBUG=',
  762. [])
  763. def test_keep_similarity(self):
  764. self._run_reviewer_test(
  765. ['--similarity', '70'],
  766. 'desc\n\nBUG=',
  767. '# Blah blah comment.\ndesc\n\nBUG=',
  768. 'desc\n\nBUG=',
  769. [])
  770. def test_keep_find_copies(self):
  771. self._run_reviewer_test(
  772. ['--no-find-copies'],
  773. 'desc\n\nBUG=',
  774. '# Blah blah comment.\ndesc\n\nBUG=\n',
  775. 'desc\n\nBUG=',
  776. [])
  777. def test_private(self):
  778. self._run_reviewer_test(
  779. ['--private'],
  780. 'desc\n\nBUG=',
  781. '# Blah blah comment.\ndesc\n\nBUG=\n',
  782. 'desc\n\nBUG=',
  783. [])
  784. def test_reviewers_cmd_line(self):
  785. # Reviewer is passed as-is
  786. description = 'desc\n\nR=foo@example.com\nBUG='
  787. self._run_reviewer_test(
  788. ['-r' 'foo@example.com'],
  789. description,
  790. '\n%s\n' % description,
  791. description,
  792. ['--reviewers=foo@example.com'])
  793. def test_reviewer_tbr_overriden(self):
  794. # Reviewer is overriden with TBR
  795. # Also verifies the regexp work without a trailing LF
  796. description = 'Foo Bar\n\nTBR=reviewer@example.com'
  797. self._run_reviewer_test(
  798. ['-r' 'foo@example.com'],
  799. 'desc\n\nR=foo@example.com\nBUG=',
  800. description.strip('\n'),
  801. description,
  802. ['--reviewers=reviewer@example.com'])
  803. def test_reviewer_multiple(self):
  804. # Handles multiple R= or TBR= lines.
  805. description = (
  806. 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
  807. 'CC=more@example.com,people@example.com')
  808. self._run_reviewer_test(
  809. [],
  810. 'desc\n\nBUG=',
  811. description,
  812. description,
  813. ['--reviewers=another@example.com,reviewer@example.com'],
  814. cc=['more@example.com', 'people@example.com'])
  815. def test_reviewer_send_mail(self):
  816. # --send-mail can be used without -r if R= is used
  817. description = 'Foo Bar\nR=reviewer@example.com'
  818. self._run_reviewer_test(
  819. ['--send-mail'],
  820. 'desc\n\nBUG=',
  821. description.strip('\n'),
  822. description,
  823. ['--reviewers=reviewer@example.com', '--send_mail'])
  824. def test_reviewer_send_mail_no_rev(self):
  825. # Fails without a reviewer.
  826. stdout = StringIO.StringIO()
  827. self.calls = self._upload_no_rev_calls(None, None) + [
  828. ((['DieWithError', 'Must specify reviewers to send email.'],),
  829. SystemExitMock())
  830. ]
  831. def RunEditor(desc, _, **kwargs):
  832. return desc
  833. self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
  834. self.mock(sys, 'stdout', stdout)
  835. with self.assertRaises(SystemExitMock):
  836. git_cl.main(['upload', '--send-mail'])
  837. self.assertEqual(
  838. 'Using 50% similarity for rename/copy detection. Override with '
  839. '--similarity.\n',
  840. stdout.getvalue())
  841. def test_bug_on_cmd(self):
  842. self._run_reviewer_test(
  843. ['--bug=500658,proj:123'],
  844. 'desc\n\nBUG=500658\nBUG=proj:123',
  845. '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
  846. 'desc\n\nBUG=500658\nBUG=proj:1234',
  847. [])
  848. def test_dcommit(self):
  849. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  850. self.calls = (
  851. self._dcommit_calls_1() +
  852. self._git_sanity_checks('fake_ancestor_sha', 'working') +
  853. self._dcommit_calls_normal() +
  854. self._dcommit_calls_3())
  855. git_cl.main(['dcommit'])
  856. def test_dcommit_bypass_hooks(self):
  857. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  858. self.calls = (
  859. self._dcommit_calls_1() +
  860. self._dcommit_calls_bypassed() +
  861. self._dcommit_calls_3())
  862. git_cl.main(['dcommit', '--bypass-hooks'])
  863. def _land_rietveld_common(self, debug=False):
  864. if debug:
  865. # Very useful due to finally clause in git cl land raising exceptions and
  866. # shadowing real cause of failure.
  867. self.mock(git_cl, '_IS_BEING_TESTED', True)
  868. else:
  869. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  870. self.mock(git_cl._GitNumbererState, 'load', classmethod(lambda _, url, ref:
  871. self._mocked_call(['_GitNumbererState', url, ref])))
  872. self.mock(RietveldMock, 'update_description', staticmethod(
  873. lambda i, d: self._mocked_call(['update_description', i, d])))
  874. self.mock(RietveldMock, 'add_comment', staticmethod(
  875. lambda i, c: self._mocked_call(['add_comment', i, c])))
  876. self.calls = [
  877. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  878. ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
  879. ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
  880. CERR1),
  881. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  882. ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
  883. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  884. ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
  885. CERR1),
  886. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  887. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  888. ((['git', 'config', 'rietveld.server'],),
  889. 'https://codereview.chromium.org'),
  890. ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
  891. ((['git', 'config', 'branch.feature.remote'],), 'origin'),
  892. ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
  893. ((['git', 'config', 'branch.feature.remote'],), 'origin'),
  894. ((['git', 'rev-list', '--merges',
  895. '--grep=^SVN changes up to revision [0-9]*$',
  896. 'refs/remotes/origin/master^!'],), ''),
  897. ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
  898. ''), # No commits to rebase, according to local view of origin.
  899. ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
  900. 'fake_ancestor_sha'),
  901. ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
  902. ((['git', 'rev-parse', '--show-cdup'],), ''),
  903. ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
  904. ((['git', 'diff', '--name-status', '--no-renames', '-r',
  905. 'fake_ancestor_sha...', '.'],),
  906. 'M\tfile1.cpp'),
  907. ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
  908. ((['git', 'config', 'branch.feature.rietveldserver'],),
  909. 'https://codereview.chromium.org'),
  910. ((['git', 'config', 'user.email'],), 'user@e.mail'),
  911. ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
  912. ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
  913. 'fake_ancestor_sha', 'feature'],),
  914. # This command just prints smth like this:
  915. # file1.cpp | 53 ++++++--
  916. # 1 file changed, 33 insertions(+), 20 deletions(-)\n
  917. ''),
  918. ((['git', 'show-ref', '--quiet', '--verify',
  919. 'refs/heads/git-cl-commit'],),
  920. ''), # 0 return code means branch exists.
  921. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  922. ((['git', 'show-ref', '--quiet', '--verify',
  923. 'refs/heads/git-cl-cherry-pick'],),
  924. CERR1), # This means git-cl-cherry-pick branch does not exist.
  925. ((['git', 'rev-parse', '--show-cdup'],), ''),
  926. ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
  927. ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
  928. ((['git', 'commit', '-m',
  929. 'Issue: 123\n\nR=john@chromium.org\n\n'
  930. 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
  931. ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
  932. ((['git', 'config', 'branch.feature.remote'],), 'origin'),
  933. ((['git', 'config', '--get', 'remote.origin.url'],),
  934. 'https://chromium.googlesource.com/infra/infra'),
  935. ]
  936. def test_land_rietveld(self):
  937. self._land_rietveld_common(debug=False)
  938. self.calls += [
  939. ((['git', 'config', 'remote.origin.url'],),
  940. 'https://chromium.googlesource.com/infra/infra'),
  941. ((['_GitNumbererState',
  942. 'https://chromium.googlesource.com/infra/infra',
  943. 'refs/heads/master'],),
  944. git_cl._GitNumbererState(None, False)),
  945. ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
  946. ''),
  947. ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
  948. ((['git', 'checkout', '-q', 'feature'],), ''),
  949. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  950. ((['git', 'config', 'rietveld.viewvc-url'],),
  951. 'https://chromium.googlesource.com/infra/infra/+/'),
  952. ((['update_description', 123,
  953. 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
  954. 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
  955. ''),
  956. ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
  957. 'fake_sha_rebased (presubmit successful).'],), ''),
  958. ]
  959. git_cl.main(['land'])
  960. def test_land_rietveld_gnumbd(self):
  961. self._land_rietveld_common(debug=False)
  962. self.mock(git_cl, 'WaitForRealCommit',
  963. lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
  964. self.calls += [
  965. ((['git', 'config', 'remote.origin.url'],),
  966. 'https://chromium.googlesource.com/chromium/src'),
  967. ((['_GitNumbererState',
  968. 'https://chromium.googlesource.com/chromium/src',
  969. 'refs/heads/master'],),
  970. git_cl._GitNumbererState('refs/pending', True)),
  971. ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
  972. ((['git', 'retry', 'fetch', 'origin',
  973. '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
  974. ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
  975. ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
  976. ((['git', 'retry', 'push', '--porcelain', 'origin',
  977. 'HEAD:refs/pending/heads/master'],),''),
  978. ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
  979. ((['git', 'checkout', '-q', 'feature'],), ''),
  980. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  981. ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
  982. 'refs/remotes/origin/master', 'refs/heads/master'],),
  983. 'fake_sha_gnumbded'),
  984. ((['git', 'config', 'rietveld.viewvc-url'],),
  985. 'https://chromium.googlesource.com/infra/infra/+/'),
  986. ((['update_description', 123,
  987. 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
  988. 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
  989. ''),
  990. ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
  991. 'fake_sha_gnumbded (presubmit successful).'],),
  992. ''),
  993. ]
  994. git_cl.main(['land'])
  995. def test_land_rietveld_git_numberer(self):
  996. self._land_rietveld_common(debug=False)
  997. # Special mocks to check validity of timestamp.
  998. original_git_amend_head = git_cl._git_amend_head
  999. def _git_amend_head_mock(msg, tstamp):
  1000. self._mocked_call(['git_amend_head committer timestamp', tstamp])
  1001. return original_git_amend_head(msg, tstamp)
  1002. self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
  1003. self.calls += [
  1004. ((['git', 'config', 'remote.origin.url'],),
  1005. 'https://chromium.googlesource.com/chromium/src'),
  1006. ((['_GitNumbererState',
  1007. 'https://chromium.googlesource.com/chromium/src',
  1008. 'refs/heads/master'],),
  1009. git_cl._GitNumbererState(None, True)),
  1010. ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
  1011. 'This is parent commit.\n'
  1012. '\n'
  1013. 'Cr-Commit-Position: refs/heads/master@{#543}\n'
  1014. 'Cr-Branched-From: refs/svn/2014@{#2208}'),
  1015. ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
  1016. '1480022355'), # Committer's unix timestamp.
  1017. ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
  1018. '1480024000'),
  1019. ((['git_amend_head committer timestamp', 1480024000],), None),
  1020. ((['git', 'commit', '--amend', '-m',
  1021. 'Issue: 123\n\nR=john@chromium.org\n'
  1022. '\n'
  1023. 'Review-Url: https://codereview.chromium.org/123 .\n'
  1024. 'Cr-Commit-Position: refs/heads/master@{#544}\n'
  1025. 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
  1026. ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
  1027. ''),
  1028. ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
  1029. ((['git', 'checkout', '-q', 'feature'],), ''),
  1030. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  1031. ((['git', 'config', 'rietveld.viewvc-url'],),
  1032. 'https://chromium.googlesource.com/infra/infra/+/'),
  1033. ((['update_description', 123,
  1034. 'Issue: 123\n\nR=john@chromium.org\n'
  1035. '\n'
  1036. 'Review-Url: https://codereview.chromium.org/123 .\n'
  1037. 'Cr-Commit-Position: refs/heads/master@{#544}\n'
  1038. 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
  1039. 'Committed: '
  1040. 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
  1041. ''),
  1042. ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
  1043. 'fake_sha_rebased (presubmit successful).'],), ''),
  1044. ]
  1045. git_cl.main(['land'])
  1046. def test_land_rietveld_git_numberer_bad_parent(self):
  1047. self._land_rietveld_common(debug=False)
  1048. self.calls += [
  1049. ((['git', 'config', 'remote.origin.url'],),
  1050. 'https://chromium.googlesource.com/v8/v8'),
  1051. ((['_GitNumbererState',
  1052. 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'],),
  1053. git_cl._GitNumbererState(None, True)),
  1054. ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
  1055. 'This is parent commit with no footer.'),
  1056. ((['git', 'checkout', '-q', 'feature'],), ''),
  1057. ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
  1058. ]
  1059. with self.assertRaises(ValueError) as cm:
  1060. git_cl.main(['land'])
  1061. self.assertEqual(cm.exception.message,
  1062. 'Unable to infer commit position from footers')
  1063. def test_GitNumbererState_not_whitelisted_repo(self):
  1064. self.calls = [
  1065. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  1066. ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
  1067. ]
  1068. res = git_cl._GitNumbererState.load(
  1069. remote_url='https://chromium.googlesource.com/chromium/tools/build',
  1070. remote_ref='refs/whatever')
  1071. self.assertEqual(res.pending_prefix, None)
  1072. self.assertEqual(res.should_add_git_number, False)
  1073. def test_GitNumbererState_fail_fetch(self):
  1074. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1075. self.calls = [
  1076. ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
  1077. '+refs/meta/config:refs/git_cl/meta/config',
  1078. '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), CERR1),
  1079. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  1080. ((['git', 'config', 'rietveld.pending-ref-prefix'],),
  1081. 'refs/pending-prefix'),
  1082. ]
  1083. res = git_cl._GitNumbererState.load(
  1084. remote_url='https://chromium.googlesource.com/chromium/src',
  1085. remote_ref='refs/whatever')
  1086. self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
  1087. self.assertEqual(res.should_add_git_number, False)
  1088. def test_GitNumbererState_fail_gnumbd_and_validator(self):
  1089. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1090. self.calls = [
  1091. ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
  1092. '+refs/meta/config:refs/git_cl/meta/config',
  1093. '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
  1094. ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
  1095. 'ba d conig'),
  1096. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  1097. ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
  1098. ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), CERR1),
  1099. ]
  1100. res = git_cl._GitNumbererState.load(
  1101. remote_url='https://chromium.googlesource.com/chromium/src',
  1102. remote_ref='refs/whatever')
  1103. self.assertEqual(res.pending_prefix, None)
  1104. self.assertEqual(res.should_add_git_number, False)
  1105. def test_GitNumbererState_valid_configs(self):
  1106. class NamedTempFileStab(StringIO.StringIO):
  1107. @classmethod
  1108. @contextlib.contextmanager
  1109. def create(cls, *_, **__):
  1110. yield cls()
  1111. name = 'tempfile'
  1112. self.mock(git_cl.tempfile, 'NamedTemporaryFile', NamedTempFileStab.create)
  1113. self.calls = [
  1114. ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
  1115. '+refs/meta/config:refs/git_cl/meta/config',
  1116. '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
  1117. ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
  1118. '''{
  1119. "pending_tag_prefix": "refs/pending-tags",
  1120. "pending_ref_prefix": "refs/pending",
  1121. "enabled_refglobs": [
  1122. "refs/heads/m*"
  1123. ]
  1124. }
  1125. '''),
  1126. ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
  1127. '''
  1128. [plugin "git-numberer"]
  1129. validate-enabled-refglob = refs/else/*
  1130. validate-enabled-refglob = refs/heads/*
  1131. validate-disabled-refglob = refs/heads/disabled
  1132. validate-disabled-refglob = refs/branch-heads/*
  1133. '''),
  1134. ((['git', 'config', '-f', 'tempfile', '--get-all',
  1135. 'plugin.git-numberer.validate-enabled-refglob'],),
  1136. 'refs/else/*\n'
  1137. 'refs/heads/*\n'),
  1138. ((['git', 'config', '-f', 'tempfile', '--get-all',
  1139. 'plugin.git-numberer.validate-disabled-refglob'],),
  1140. 'refs/heads/disabled\n'
  1141. 'refs/branch-heads/*\n'),
  1142. ] * 4 # 4 tests below have exactly same IO.
  1143. res = git_cl._GitNumbererState.load(
  1144. remote_url='https://chromium.googlesource.com/chromium/src',
  1145. remote_ref='refs/heads/master')
  1146. self.assertEqual(res.pending_prefix, 'refs/pending/')
  1147. self.assertEqual(res.should_add_git_number, False)
  1148. res = git_cl._GitNumbererState.load(
  1149. remote_url='https://chromium.googlesource.com/chromium/src',
  1150. remote_ref='refs/heads/test')
  1151. self.assertEqual(res.pending_prefix, None)
  1152. self.assertEqual(res.should_add_git_number, True)
  1153. res = git_cl._GitNumbererState.load(
  1154. remote_url='https://chromium.googlesource.com/chromium/src',
  1155. remote_ref='refs/heads/disabled')
  1156. self.assertEqual(res.pending_prefix, None)
  1157. self.assertEqual(res.should_add_git_number, False)
  1158. # Validator is disabled by default, even if it's not explicitely in disabled
  1159. # refglobs.
  1160. res = git_cl._GitNumbererState.load(
  1161. remote_url='https://chromium.googlesource.com/chromium/src',
  1162. remote_ref='refs/arbitrary/ref')
  1163. self.assertEqual(res.pending_prefix, None)
  1164. self.assertEqual(res.should_add_git_number, False)
  1165. @classmethod
  1166. def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
  1167. cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
  1168. if skip_auth_check:
  1169. return [((cmd, ), 'true')]
  1170. calls = [((cmd, ), CERR1)]
  1171. if issue:
  1172. calls.extend([
  1173. ((['git', 'config', 'branch.master.gerritserver'],), ''),
  1174. ])
  1175. calls.extend([
  1176. ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
  1177. ((['git', 'config', 'branch.master.remote'],), 'origin'),
  1178. ((['git', 'config', 'remote.origin.url'],),
  1179. 'https://chromium.googlesource.com/my/repo'),
  1180. ((['git', 'config', 'remote.origin.url'],),
  1181. 'https://chromium.googlesource.com/my/repo'),
  1182. ])
  1183. return calls
  1184. @classmethod
  1185. def _gerrit_base_calls(cls, issue=None):
  1186. return [
  1187. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1188. ((['git', 'config', 'branch.master.git-cl-similarity'],),
  1189. CERR1),
  1190. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1191. ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
  1192. CERR1),
  1193. ] + cls._is_gerrit_calls(True) + [
  1194. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1195. ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
  1196. ((['git', 'config', 'branch.master.gerritissue'],),
  1197. CERR1 if issue is None else str(issue)),
  1198. ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
  1199. ((['git', 'config', 'branch.master.remote'],), 'origin'),
  1200. ((['get_or_create_merge_base', 'master',
  1201. 'refs/remotes/origin/master'],),
  1202. 'fake_ancestor_sha'),
  1203. # Calls to verify branch point is ancestor
  1204. ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
  1205. cls._git_sanity_checks('fake_ancestor_sha', 'master',
  1206. get_remote_branch=False)) + [
  1207. ((['git', 'rev-parse', '--show-cdup'],), ''),
  1208. ((['git', 'rev-parse', 'HEAD'],), '12345'),
  1209. ((['git',
  1210. 'diff', '--name-status', '--no-renames', '-r',
  1211. 'fake_ancestor_sha...', '.'],),
  1212. 'M\t.gitignore\n'),
  1213. ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
  1214. ] + ([] if issue else [
  1215. ((['git',
  1216. 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
  1217. 'foo'),
  1218. ]) + [
  1219. ((['git', 'config', 'user.email'],), 'me@example.com'),
  1220. ((['git',
  1221. 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
  1222. 'fake_ancestor_sha', 'HEAD'],),
  1223. '+dat'),
  1224. ]
  1225. @classmethod
  1226. def _gerrit_upload_calls(cls, description, reviewers, squash,
  1227. squash_mode='default',
  1228. expected_upstream_ref='origin/refs/heads/master',
  1229. ref_suffix='', notify=False,
  1230. post_amend_description=None, issue=None, cc=None):
  1231. if post_amend_description is None:
  1232. post_amend_description = description
  1233. calls = []
  1234. cc = cc or []
  1235. if squash_mode == 'default':
  1236. calls.extend([
  1237. ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
  1238. ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
  1239. ])
  1240. elif squash_mode in ('override_squash', 'override_nosquash'):
  1241. calls.extend([
  1242. ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
  1243. 'true' if squash_mode == 'override_squash' else 'false'),
  1244. ])
  1245. else:
  1246. assert squash_mode in ('squash', 'nosquash')
  1247. # If issue is given, then description is fetched from Gerrit instead.
  1248. if issue is None:
  1249. calls += [
  1250. ((['git', 'log', '--pretty=format:%s\n\n%b',
  1251. 'fake_ancestor_sha..HEAD'],),
  1252. description)]
  1253. if not git_footers.get_footer_change_id(description) and not squash:
  1254. calls += [
  1255. # DownloadGerritHook(False)
  1256. ((False, ),
  1257. ''),
  1258. # Amending of commit message to get the Change-Id.
  1259. ((['git', 'log', '--pretty=format:%s\n\n%b',
  1260. 'fake_ancestor_sha..HEAD'],),
  1261. description),
  1262. ((['git', 'commit', '--amend', '-m', description],),
  1263. ''),
  1264. ((['git', 'log', '--pretty=format:%s\n\n%b',
  1265. 'fake_ancestor_sha..HEAD'],),
  1266. post_amend_description)
  1267. ]
  1268. if squash:
  1269. if not issue:
  1270. # Prompting to edit description on first upload.
  1271. calls += [
  1272. ((['git', 'config', 'core.editor'],), ''),
  1273. ((['RunEditor'],), description),
  1274. ]
  1275. ref_to_push = 'abcdef0123456789'
  1276. calls += [
  1277. ((['git', 'config', 'branch.master.merge'],),
  1278. 'refs/heads/master'),
  1279. ((['git', 'config', 'branch.master.remote'],),
  1280. 'origin'),
  1281. ((['get_or_create_merge_base', 'master',
  1282. 'refs/remotes/origin/master'],),
  1283. 'origin/master'),
  1284. ((['git', 'rev-parse', 'HEAD:'],),
  1285. '0123456789abcdef'),
  1286. ((['git', 'commit-tree', '0123456789abcdef', '-p',
  1287. 'origin/master', '-m', description],),
  1288. ref_to_push),
  1289. ]
  1290. else:
  1291. ref_to_push = 'HEAD'
  1292. calls += [
  1293. ((['git', 'rev-list',
  1294. expected_upstream_ref + '..' + ref_to_push],), ''),
  1295. ]
  1296. notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
  1297. if ref_suffix:
  1298. ref_suffix += ',' + notify_suffix
  1299. else:
  1300. ref_suffix = '%' + notify_suffix
  1301. if reviewers:
  1302. ref_suffix += ',' + ','.join('r=%s' % email
  1303. for email in sorted(reviewers))
  1304. calls += [
  1305. ((['git', 'push', 'origin',
  1306. ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
  1307. ('remote:\n'
  1308. 'remote: Processing changes: (\)\n'
  1309. 'remote: Processing changes: (|)\n'
  1310. 'remote: Processing changes: (/)\n'
  1311. 'remote: Processing changes: (-)\n'
  1312. 'remote: Processing changes: new: 1 (/)\n'
  1313. 'remote: Processing changes: new: 1, done\n'
  1314. 'remote:\n'
  1315. 'remote: New Changes:\n'
  1316. 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
  1317. 'remote:\n'
  1318. 'To https://chromium.googlesource.com/yyy/zzz\n'
  1319. ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
  1320. ]
  1321. if squash:
  1322. calls += [
  1323. ((['git', 'config', 'branch.master.gerritissue', '123456'],),
  1324. ''),
  1325. ((['git', 'config', 'branch.master.gerritserver',
  1326. 'https://chromium-review.googlesource.com'],), ''),
  1327. ((['git', 'config', 'branch.master.gerritsquashhash',
  1328. 'abcdef0123456789'],), ''),
  1329. ]
  1330. calls += [
  1331. ((['git', 'config', 'rietveld.cc'],), ''),
  1332. ((['AddReviewers', 'chromium-review.googlesource.com',
  1333. 123456 if squash else None,
  1334. ['joe@example.com'] + cc, False],), ''),
  1335. ]
  1336. calls += cls._git_post_upload_calls()
  1337. return calls
  1338. def _run_gerrit_upload_test(
  1339. self,
  1340. upload_args,
  1341. description,
  1342. reviewers=None,
  1343. squash=True,
  1344. squash_mode=None,
  1345. expected_upstream_ref='origin/refs/heads/master',
  1346. ref_suffix='',
  1347. notify=False,
  1348. post_amend_description=None,
  1349. issue=None,
  1350. cc=None):
  1351. """Generic gerrit upload test framework."""
  1352. if squash_mode is None:
  1353. if '--no-squash' in upload_args:
  1354. squash_mode = 'nosquash'
  1355. elif '--squash' in upload_args:
  1356. squash_mode = 'squash'
  1357. else:
  1358. squash_mode = 'default'
  1359. reviewers = reviewers or []
  1360. cc = cc or []
  1361. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1362. self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
  1363. CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
  1364. self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
  1365. lambda _, offer_removal: None)
  1366. self.mock(git_cl.gclient_utils, 'RunEditor',
  1367. lambda *_, **__: self._mocked_call(['RunEditor']))
  1368. self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
  1369. self.mock(git_cl.gerrit_util, 'AddReviewers',
  1370. lambda h, i, add, is_reviewer: self._mocked_call(
  1371. ['AddReviewers', h, i, add, is_reviewer]))
  1372. self.calls = self._gerrit_base_calls(issue=issue)
  1373. self.calls += self._gerrit_upload_calls(
  1374. description, reviewers, squash,
  1375. squash_mode=squash_mode,
  1376. expected_upstream_ref=expected_upstream_ref,
  1377. ref_suffix=ref_suffix, notify=notify,
  1378. post_amend_description=post_amend_description,
  1379. issue=issue, cc=cc)
  1380. # Uncomment when debugging.
  1381. # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
  1382. git_cl.main(['upload'] + upload_args)
  1383. def test_gerrit_upload_without_change_id(self):
  1384. self._run_gerrit_upload_test(
  1385. ['--no-squash'],
  1386. 'desc\n\nBUG=\n',
  1387. [],
  1388. squash=False,
  1389. post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
  1390. def test_gerrit_upload_without_change_id_override_nosquash(self):
  1391. self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
  1392. self._run_gerrit_upload_test(
  1393. [],
  1394. 'desc\n\nBUG=\n',
  1395. [],
  1396. squash=False,
  1397. squash_mode='override_nosquash',
  1398. post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
  1399. def test_gerrit_no_reviewer(self):
  1400. self._run_gerrit_upload_test(
  1401. [],
  1402. 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
  1403. [],
  1404. squash=False,
  1405. squash_mode='override_nosquash')
  1406. def test_gerrit_patch_bad_chars(self):
  1407. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1408. self._run_gerrit_upload_test(
  1409. ['-f', '-t', 'Don\'t put bad cha,.rs'],
  1410. 'desc\n\nBUG=\n\nChange-Id: I123456789',
  1411. squash=False,
  1412. squash_mode='override_nosquash',
  1413. ref_suffix='%m=Dont_put_bad_chars')
  1414. self.assertIn(
  1415. 'WARNING: Patchset title may only contain alphanumeric chars '
  1416. 'and spaces. Cleaned up title:\nDont put bad chars\n',
  1417. git_cl.sys.stdout.getvalue())
  1418. def test_gerrit_reviewers_cmd_line(self):
  1419. self._run_gerrit_upload_test(
  1420. ['-r', 'foo@example.com', '--send-mail'],
  1421. 'desc\n\nBUG=\n\nChange-Id: I123456789',
  1422. ['foo@example.com'],
  1423. squash=False,
  1424. squash_mode='override_nosquash',
  1425. notify=True)
  1426. def test_gerrit_reviewer_multiple(self):
  1427. self._run_gerrit_upload_test(
  1428. [],
  1429. 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
  1430. 'CC=more@example.com,people@example.com\n\n'
  1431. 'Change-Id: 123456789\n',
  1432. ['reviewer@example.com', 'another@example.com'],
  1433. squash=False,
  1434. squash_mode='override_nosquash',
  1435. ref_suffix='%l=Code-Review+1',
  1436. cc=['more@example.com', 'people@example.com'])
  1437. def test_gerrit_upload_squash_first_is_default(self):
  1438. # Mock Gerrit CL description to indicate the first upload.
  1439. self.mock(git_cl.Changelist, 'GetDescription',
  1440. lambda *_: None)
  1441. self._run_gerrit_upload_test(
  1442. [],
  1443. 'desc\nBUG=\n\nChange-Id: 123456789',
  1444. [],
  1445. expected_upstream_ref='origin/master')
  1446. def test_gerrit_upload_squash_first(self):
  1447. # Mock Gerrit CL description to indicate the first upload.
  1448. self.mock(git_cl.Changelist, 'GetDescription',
  1449. lambda *_: None)
  1450. self._run_gerrit_upload_test(
  1451. ['--squash'],
  1452. 'desc\nBUG=\n\nChange-Id: 123456789',
  1453. [],
  1454. squash=True,
  1455. expected_upstream_ref='origin/master')
  1456. def test_gerrit_upload_squash_reupload(self):
  1457. description = 'desc\nBUG=\n\nChange-Id: 123456789'
  1458. # Mock Gerrit CL description to indicate re-upload.
  1459. self.mock(git_cl.Changelist, 'GetDescription',
  1460. lambda *args: description)
  1461. self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
  1462. lambda *args: 1)
  1463. self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
  1464. lambda *args: {'change_id': '123456789'})
  1465. self._run_gerrit_upload_test(
  1466. ['--squash'],
  1467. description,
  1468. [],
  1469. squash=True,
  1470. expected_upstream_ref='origin/master',
  1471. issue=123456)
  1472. def test_upload_branch_deps(self):
  1473. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1474. def mock_run_git(*args, **_kwargs):
  1475. if args[0] == ['for-each-ref',
  1476. '--format=%(refname:short) %(upstream:short)',
  1477. 'refs/heads']:
  1478. # Create a local branch dependency tree that looks like this:
  1479. # test1 -> test2 -> test3 -> test4 -> test5
  1480. # -> test3.1
  1481. # test6 -> test0
  1482. branch_deps = [
  1483. 'test2 test1', # test1 -> test2
  1484. 'test3 test2', # test2 -> test3
  1485. 'test3.1 test2', # test2 -> test3.1
  1486. 'test4 test3', # test3 -> test4
  1487. 'test5 test4', # test4 -> test5
  1488. 'test6 test0', # test0 -> test6
  1489. 'test7', # test7
  1490. ]
  1491. return '\n'.join(branch_deps)
  1492. self.mock(git_cl, 'RunGit', mock_run_git)
  1493. class RecordCalls:
  1494. times_called = 0
  1495. record_calls = RecordCalls()
  1496. def mock_CMDupload(*args, **_kwargs):
  1497. record_calls.times_called += 1
  1498. return 0
  1499. self.mock(git_cl, 'CMDupload', mock_CMDupload)
  1500. self.calls = [
  1501. (('[Press enter to continue or ctrl-C to quit]',), ''),
  1502. ]
  1503. class MockChangelist():
  1504. def __init__(self):
  1505. pass
  1506. def GetBranch(self):
  1507. return 'test1'
  1508. def GetIssue(self):
  1509. return '123'
  1510. def GetPatchset(self):
  1511. return '1001'
  1512. def IsGerrit(self):
  1513. return False
  1514. ret = git_cl.upload_branch_deps(MockChangelist(), [])
  1515. # CMDupload should have been called 5 times because of 5 dependent branches.
  1516. self.assertEquals(5, record_calls.times_called)
  1517. self.assertEquals(0, ret)
  1518. def test_gerrit_change_id(self):
  1519. self.calls = [
  1520. ((['git', 'write-tree'], ),
  1521. 'hashtree'),
  1522. ((['git', 'rev-parse', 'HEAD~0'], ),
  1523. 'branch-parent'),
  1524. ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
  1525. 'A B <a@b.org> 1456848326 +0100'),
  1526. ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
  1527. 'C D <c@d.org> 1456858326 +0100'),
  1528. ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
  1529. 'hashchange'),
  1530. ]
  1531. change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
  1532. self.assertEqual(change_id, 'Ihashchange')
  1533. def test_desecription_append_footer(self):
  1534. for init_desc, footer_line, expected_desc in [
  1535. # Use unique desc first lines for easy test failure identification.
  1536. ('foo', 'R=one', 'foo\n\nR=one'),
  1537. ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
  1538. ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  1539. ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  1540. ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
  1541. 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
  1542. ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
  1543. 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
  1544. ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
  1545. 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
  1546. ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
  1547. ]:
  1548. desc = git_cl.ChangeDescription(init_desc)
  1549. desc.append_footer(footer_line)
  1550. self.assertEqual(desc.description, expected_desc)
  1551. def test_update_reviewers(self):
  1552. data = [
  1553. ('foo', [], 'foo'),
  1554. ('foo\nR=xx', [], 'foo\nR=xx'),
  1555. ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
  1556. ('foo', ['a@c'], 'foo\n\nR=a@c'),
  1557. ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
  1558. ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
  1559. ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
  1560. ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
  1561. ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'),
  1562. ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
  1563. ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
  1564. ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
  1565. # Same as the line before, but full of whitespaces.
  1566. (
  1567. 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
  1568. 'foo\nBar\n\nR=c@c\n BUG =',
  1569. ),
  1570. # Whitespaces aren't interpreted as new lines.
  1571. ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
  1572. ]
  1573. expected = [i[2] for i in data]
  1574. actual = []
  1575. for orig, reviewers, _expected in data:
  1576. obj = git_cl.ChangeDescription(orig)
  1577. obj.update_reviewers(reviewers)
  1578. actual.append(obj.description)
  1579. self.assertEqual(expected, actual)
  1580. def test_get_target_ref(self):
  1581. # Check remote or remote branch not present.
  1582. self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
  1583. self.assertEqual(None, git_cl.GetTargetRef(None,
  1584. 'refs/remotes/origin/master',
  1585. 'master', False))
  1586. # Check default target refs for branches.
  1587. self.assertEqual('refs/heads/master',
  1588. git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
  1589. None, False))
  1590. self.assertEqual('refs/heads/master',
  1591. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
  1592. None, False))
  1593. self.assertEqual('refs/heads/master',
  1594. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
  1595. None, False))
  1596. self.assertEqual('refs/branch-heads/123',
  1597. git_cl.GetTargetRef('origin',
  1598. 'refs/remotes/branch-heads/123',
  1599. None, False))
  1600. self.assertEqual('refs/diff/test',
  1601. git_cl.GetTargetRef('origin',
  1602. 'refs/remotes/origin/refs/diff/test',
  1603. None, False))
  1604. self.assertEqual('refs/heads/chrome/m42',
  1605. git_cl.GetTargetRef('origin',
  1606. 'refs/remotes/origin/chrome/m42',
  1607. None, False))
  1608. # Check target refs for user-specified target branch.
  1609. for branch in ('branch-heads/123', 'remotes/branch-heads/123',
  1610. 'refs/remotes/branch-heads/123'):
  1611. self.assertEqual('refs/branch-heads/123',
  1612. git_cl.GetTargetRef('origin',
  1613. 'refs/remotes/origin/master',
  1614. branch, False))
  1615. for branch in ('origin/master', 'remotes/origin/master',
  1616. 'refs/remotes/origin/master'):
  1617. self.assertEqual('refs/heads/master',
  1618. git_cl.GetTargetRef('origin',
  1619. 'refs/remotes/branch-heads/123',
  1620. branch, False))
  1621. for branch in ('master', 'heads/master', 'refs/heads/master'):
  1622. self.assertEqual('refs/heads/master',
  1623. git_cl.GetTargetRef('origin',
  1624. 'refs/remotes/branch-heads/123',
  1625. branch, False))
  1626. # Check target refs for pending prefix.
  1627. self.mock(git_cl._GitNumbererState, 'load',
  1628. classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
  1629. self.assertEqual('prefix/heads/master',
  1630. git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
  1631. None, True,
  1632. 'https://remote.url/some.git'))
  1633. def test_patch_when_dirty(self):
  1634. # Patch when local tree is dirty
  1635. self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
  1636. self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
  1637. def test_diff_when_dirty(self):
  1638. # Do 'git cl diff' when local tree is dirty
  1639. self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
  1640. self.assertNotEqual(git_cl.main(['diff']), 0)
  1641. def _patch_common(self, is_gerrit=False, force_codereview=False,
  1642. new_branch=False):
  1643. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1644. self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
  1645. lambda x: '60001')
  1646. self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
  1647. lambda *args: {
  1648. 'current_revision': '7777777777',
  1649. 'revisions': {
  1650. '1111111111': {
  1651. '_number': 1,
  1652. 'fetch': {'http': {
  1653. 'url': 'https://chromium.googlesource.com/my/repo',
  1654. 'ref': 'refs/changes/56/123456/1',
  1655. }},
  1656. },
  1657. '7777777777': {
  1658. '_number': 7,
  1659. 'fetch': {'http': {
  1660. 'url': 'https://chromium.googlesource.com/my/repo',
  1661. 'ref': 'refs/changes/56/123456/7',
  1662. }},
  1663. },
  1664. },
  1665. })
  1666. self.mock(git_cl.Changelist, 'GetDescription',
  1667. lambda *args: 'Description')
  1668. self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
  1669. if new_branch:
  1670. self.calls = [((['git', 'new-branch', 'master'],), ''),]
  1671. else:
  1672. self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
  1673. if not force_codereview:
  1674. # These calls detect codereview to use.
  1675. self.calls += [
  1676. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1677. ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
  1678. ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
  1679. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  1680. ]
  1681. if is_gerrit:
  1682. if not force_codereview:
  1683. self.calls += [
  1684. ((['git', 'config', 'gerrit.host'],), 'true'),
  1685. ]
  1686. else:
  1687. self.calls += [
  1688. ((['git', 'config', 'gerrit.host'],), CERR1),
  1689. ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
  1690. ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
  1691. ((['git', 'rev-parse', '--show-cdup'],), ''),
  1692. ]
  1693. def _common_patch_successful(self, new_branch=False):
  1694. self._patch_common(new_branch=new_branch)
  1695. self.calls += [
  1696. ((['git', 'commit', '-m',
  1697. 'Description\n\n' +
  1698. 'patch from issue 123456 at patchset 60001 ' +
  1699. '(http://crrev.com/123456#ps60001)'],), ''),
  1700. ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
  1701. ''),
  1702. ((['git', 'config', 'branch.master.rietveldserver',
  1703. 'https://codereview.example.com'],), ''),
  1704. ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
  1705. ''),
  1706. ]
  1707. def test_patch_successful(self):
  1708. self._common_patch_successful()
  1709. self.assertEqual(git_cl.main(['patch', '123456']), 0)
  1710. def test_patch_successful_new_branch(self):
  1711. self._common_patch_successful(new_branch=True)
  1712. self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
  1713. def test_patch_conflict(self):
  1714. self._patch_common()
  1715. GitCheckoutMock.conflict = True
  1716. self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
  1717. def test_gerrit_patch_successful(self):
  1718. self._patch_common(is_gerrit=True)
  1719. self.calls += [
  1720. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1721. 'refs/changes/56/123456/7'],), ''),
  1722. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1723. ((['git', 'config', 'branch.master.gerritissue', '123456'],),
  1724. ''),
  1725. ((['git', 'config', 'branch.master.gerritserver'],), ''),
  1726. ((['git', 'config', 'branch.master.merge'],), 'master'),
  1727. ((['git', 'config', 'branch.master.remote'],), 'origin'),
  1728. ((['git', 'config', 'remote.origin.url'],),
  1729. 'https://chromium.googlesource.com/my/repo'),
  1730. ((['git', 'config', 'branch.master.gerritserver',
  1731. 'https://chromium-review.googlesource.com'],), ''),
  1732. ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
  1733. ]
  1734. self.assertEqual(git_cl.main(['patch', '123456']), 0)
  1735. def test_patch_force_codereview(self):
  1736. self._patch_common(is_gerrit=True, force_codereview=True)
  1737. self.calls += [
  1738. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1739. 'refs/changes/56/123456/7'],), ''),
  1740. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1741. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1742. ((['git', 'config', 'branch.master.gerritissue', '123456'],),
  1743. ''),
  1744. ((['git', 'config', 'branch.master.gerritserver'],), ''),
  1745. ((['git', 'config', 'branch.master.merge'],), 'master'),
  1746. ((['git', 'config', 'branch.master.remote'],), 'origin'),
  1747. ((['git', 'config', 'remote.origin.url'],),
  1748. 'https://chromium.googlesource.com/my/repo'),
  1749. ((['git', 'config', 'branch.master.gerritserver',
  1750. 'https://chromium-review.googlesource.com'],), ''),
  1751. ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
  1752. ]
  1753. self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
  1754. def test_gerrit_patch_url_successful(self):
  1755. self._patch_common(is_gerrit=True)
  1756. self.calls += [
  1757. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1758. 'refs/changes/56/123456/1'],), ''),
  1759. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1760. ((['git', 'config', 'branch.master.gerritissue', '123456'],),
  1761. ''),
  1762. ((['git', 'config', 'branch.master.gerritserver',
  1763. 'https://chromium-review.googlesource.com'],), ''),
  1764. ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
  1765. ]
  1766. self.assertEqual(git_cl.main(
  1767. ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
  1768. def test_gerrit_patch_conflict(self):
  1769. self._patch_common(is_gerrit=True)
  1770. self.calls += [
  1771. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1772. 'refs/changes/56/123456/1'],), ''),
  1773. ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
  1774. ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
  1775. SystemExitMock()),
  1776. ]
  1777. with self.assertRaises(SystemExitMock):
  1778. git_cl.main(['patch',
  1779. 'https://chromium-review.googlesource.com/#/c/123456/1'])
  1780. def test_gerrit_patch_not_exists(self):
  1781. def notExists(_issue, *_, **kwargs):
  1782. self.assertFalse(kwargs['ignore_404'])
  1783. raise git_cl.gerrit_util.GerritError(404, '')
  1784. self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
  1785. url = 'https://chromium-review.googlesource.com'
  1786. self.calls = [
  1787. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1788. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  1789. ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
  1790. ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
  1791. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  1792. ((['git', 'config', 'gerrit.host'],), 'true'),
  1793. ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
  1794. 'or you have no access to it'],), SystemExitMock()),
  1795. ]
  1796. with self.assertRaises(SystemExitMock):
  1797. self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
  1798. def _checkout_calls(self):
  1799. return [
  1800. ((['git', 'config', '--local', '--get-regexp',
  1801. 'branch\\..*\\.rietveldissue'], ),
  1802. ('branch.retrying.rietveldissue 1111111111\n'
  1803. 'branch.some-fix.rietveldissue 2222222222\n')),
  1804. ((['git', 'config', '--local', '--get-regexp',
  1805. 'branch\\..*\\.gerritissue'], ),
  1806. ('branch.ger-branch.gerritissue 123456\n'
  1807. 'branch.gbranch654.gerritissue 654321\n')),
  1808. ]
  1809. def test_checkout_gerrit(self):
  1810. """Tests git cl checkout <issue>."""
  1811. self.calls = self._checkout_calls()
  1812. self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
  1813. self.assertEqual(0, git_cl.main(['checkout', '123456']))
  1814. def test_checkout_rietveld(self):
  1815. """Tests git cl checkout <issue>."""
  1816. self.calls = self._checkout_calls()
  1817. self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
  1818. self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
  1819. def test_checkout_not_found(self):
  1820. """Tests git cl checkout <issue>."""
  1821. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1822. self.calls = self._checkout_calls()
  1823. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  1824. def test_checkout_no_branch_issues(self):
  1825. """Tests git cl checkout <issue>."""
  1826. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1827. self.calls = [
  1828. ((['git', 'config', '--local', '--get-regexp',
  1829. 'branch\\..*\\.rietveldissue'], ), CERR1),
  1830. ((['git', 'config', '--local', '--get-regexp',
  1831. 'branch\\..*\\.gerritissue'], ), CERR1),
  1832. ]
  1833. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  1834. def _test_gerrit_ensure_authenticated_common(self, auth,
  1835. skip_auth_check=False):
  1836. self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
  1837. CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
  1838. self.mock(git_cl, 'DieWithError',
  1839. lambda msg: self._mocked_call(['DieWithError', msg]))
  1840. self.mock(git_cl, 'ask_for_data',
  1841. lambda msg: self._mocked_call(['ask_for_data', msg]))
  1842. self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
  1843. cl = git_cl.Changelist(codereview='gerrit')
  1844. cl.branch = 'master'
  1845. cl.branchref = 'refs/heads/master'
  1846. cl.lookedup_issue = True
  1847. return cl
  1848. def test_gerrit_ensure_authenticated_missing(self):
  1849. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1850. 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
  1851. })
  1852. self.calls.append(
  1853. ((['DieWithError',
  1854. 'Credentials for the following hosts are required:\n'
  1855. ' chromium-review.googlesource.com\n'
  1856. 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
  1857. 'You can (re)generate your credentails by visiting '
  1858. 'https://chromium-review.googlesource.com/new-password'],), ''),)
  1859. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1860. def test_gerrit_ensure_authenticated_conflict(self):
  1861. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  1862. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1863. 'chromium.googlesource.com': 'one',
  1864. 'chromium-review.googlesource.com': 'other',
  1865. })
  1866. self.calls.append(
  1867. ((['ask_for_data', 'If you know what you are doing, '
  1868. 'press Enter to continue, Ctrl+C to abort.'],), ''))
  1869. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1870. def test_gerrit_ensure_authenticated_ok(self):
  1871. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1872. 'chromium.googlesource.com': 'same',
  1873. 'chromium-review.googlesource.com': 'same',
  1874. })
  1875. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1876. def test_gerrit_ensure_authenticated_skipped(self):
  1877. cl = self._test_gerrit_ensure_authenticated_common(
  1878. auth={}, skip_auth_check=True)
  1879. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1880. def test_cmd_set_commit_rietveld(self):
  1881. self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
  1882. lambda _, v: self._mocked_call(['SetFlags', v]))
  1883. self.calls = [
  1884. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  1885. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  1886. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  1887. ((['git', 'config', 'rietveld.server'],), ''),
  1888. ((['git', 'config', 'rietveld.server'],), ''),
  1889. ((['git', 'config', 'branch.feature.rietveldserver'],),
  1890. 'https://codereview.chromium.org'),
  1891. ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
  1892. ]
  1893. self.assertEqual(0, git_cl.main(['set-commit']))
  1894. def _cmd_set_commit_gerrit_common(self, vote, notify=None):
  1895. self.mock(git_cl.gerrit_util, 'SetReview',
  1896. lambda h, i, labels, notify=None:
  1897. self._mocked_call(['SetReview', h, i, labels, notify]))
  1898. self.calls = [
  1899. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  1900. ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
  1901. ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
  1902. ((['git', 'config', 'branch.feature.gerritserver'],),
  1903. 'https://chromium-review.googlesource.com'),
  1904. ((['SetReview', 'chromium-review.googlesource.com', 123,
  1905. {'Commit-Queue': vote}, notify],), ''),
  1906. ]
  1907. def test_cmd_set_commit_gerrit_clear(self):
  1908. self._cmd_set_commit_gerrit_common(0)
  1909. self.assertEqual(0, git_cl.main(['set-commit', '-c']))
  1910. def test_cmd_set_commit_gerrit_dry(self):
  1911. self._cmd_set_commit_gerrit_common(1, notify='NONE')
  1912. self.assertEqual(0, git_cl.main(['set-commit', '-d']))
  1913. def test_cmd_set_commit_gerrit(self):
  1914. self._cmd_set_commit_gerrit_common(2)
  1915. self.assertEqual(0, git_cl.main(['set-commit']))
  1916. def test_description_display(self):
  1917. out = StringIO.StringIO()
  1918. self.mock(git_cl.sys, 'stdout', out)
  1919. self.mock(git_cl, 'Changelist', ChangelistMock)
  1920. ChangelistMock.desc = 'foo\n'
  1921. self.assertEqual(0, git_cl.main(['description', '-d']))
  1922. self.assertEqual('foo\n', out.getvalue())
  1923. def test_description_rietveld(self):
  1924. out = StringIO.StringIO()
  1925. self.mock(git_cl.sys, 'stdout', out)
  1926. self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
  1927. self.assertEqual(0, git_cl.main([
  1928. 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
  1929. self.assertEqual('foobar\n', out.getvalue())
  1930. def test_StatusFieldOverrideIssueMissingArgs(self):
  1931. out = StringIO.StringIO()
  1932. self.mock(git_cl.sys, 'stderr', out)
  1933. try:
  1934. self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
  1935. except SystemExit as ex:
  1936. self.assertEqual(ex.code, 2)
  1937. self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
  1938. out = StringIO.StringIO()
  1939. self.mock(git_cl.sys, 'stderr', out)
  1940. try:
  1941. self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
  1942. except SystemExit as ex:
  1943. self.assertEqual(ex.code, 2)
  1944. self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
  1945. def test_StatusFieldOverrideIssue(self):
  1946. out = StringIO.StringIO()
  1947. self.mock(git_cl.sys, 'stdout', out)
  1948. def assertIssue(cl_self, *_args):
  1949. self.assertEquals(cl_self.issue, 1)
  1950. return 'foobar'
  1951. self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
  1952. self.calls = [
  1953. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  1954. ((['git', 'config', 'rietveld.server'],), ''),
  1955. ((['git', 'config', 'rietveld.server'],), ''),
  1956. ]
  1957. self.assertEqual(
  1958. git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
  1959. 0)
  1960. self.assertEqual(out.getvalue(), 'foobar\n')
  1961. def test_SetCloseOverrideIssue(self):
  1962. def assertIssue(cl_self, *_args):
  1963. self.assertEquals(cl_self.issue, 1)
  1964. return 'foobar'
  1965. self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
  1966. self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
  1967. self.calls = [
  1968. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  1969. ((['git', 'config', 'rietveld.server'],), ''),
  1970. ((['git', 'config', 'rietveld.server'],), ''),
  1971. ]
  1972. self.assertEqual(
  1973. git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
  1974. def test_SetCommitOverrideIssue(self):
  1975. def assertIssue(cl_self, *_args):
  1976. self.assertEquals(cl_self.issue, 1)
  1977. return 'foobar'
  1978. self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
  1979. self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
  1980. self.calls = [
  1981. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  1982. ((['git', 'config', 'rietveld.server'],), ''),
  1983. ((['git', 'config', 'rietveld.server'],), ''),
  1984. ((['git', 'symbolic-ref', 'HEAD'],), ''),
  1985. ((['git', 'config', 'rietveld.server'],), ''),
  1986. ((['git', 'config', 'rietveld.server'],), ''),
  1987. ]
  1988. self.assertEqual(
  1989. git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
  1990. def test_description_gerrit(self):
  1991. out = StringIO.StringIO()
  1992. self.mock(git_cl.sys, 'stdout', out)
  1993. self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
  1994. self.assertEqual(0, git_cl.main([
  1995. 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
  1996. self.assertEqual('foobar\n', out.getvalue())
  1997. def test_description_set_raw(self):
  1998. out = StringIO.StringIO()
  1999. self.mock(git_cl.sys, 'stdout', out)
  2000. self.mock(git_cl, 'Changelist', ChangelistMock)
  2001. self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
  2002. self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
  2003. self.assertEqual('hihi', ChangelistMock.desc)
  2004. def test_description_appends_bug_line(self):
  2005. current_desc = 'Some.\n\nChange-Id: xxx'
  2006. def RunEditor(desc, _, **kwargs):
  2007. self.assertEquals(
  2008. '# Enter a description of the change.\n'
  2009. '# This will be displayed on the codereview site.\n'
  2010. '# The first line will also be used as the subject of the review.\n'
  2011. '#--------------------This line is 72 characters long'
  2012. '--------------------\n'
  2013. 'Some.\n\nBUG=\n\nChange-Id: xxx',
  2014. desc)
  2015. # Simulate user changing something.
  2016. return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
  2017. def UpdateDescriptionRemote(_, desc, force=False):
  2018. self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
  2019. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2020. self.mock(git_cl.Changelist, 'GetDescription',
  2021. lambda *args: current_desc)
  2022. self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
  2023. UpdateDescriptionRemote)
  2024. self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
  2025. self.calls = [
  2026. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2027. ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
  2028. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2029. ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
  2030. ((['git', 'config', 'core.editor'],), 'vi'),
  2031. ]
  2032. self.assertEqual(0, git_cl.main(['description', '--gerrit']))
  2033. def test_description_set_stdin(self):
  2034. out = StringIO.StringIO()
  2035. self.mock(git_cl.sys, 'stdout', out)
  2036. self.mock(git_cl, 'Changelist', ChangelistMock)
  2037. self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
  2038. self.assertEqual(0, git_cl.main(['description', '-n', '-']))
  2039. self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
  2040. def test_archive(self):
  2041. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2042. self.calls = \
  2043. [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2044. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  2045. ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
  2046. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2047. ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
  2048. ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
  2049. ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
  2050. ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
  2051. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  2052. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
  2053. ((['git', 'branch', '-D', 'foo'],), '')]
  2054. self.mock(git_cl, 'get_cl_statuses',
  2055. lambda branches, fine_grained, max_processes:
  2056. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  2057. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2058. (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
  2059. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2060. def test_archive_current_branch_fails(self):
  2061. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2062. self.calls = \
  2063. [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2064. 'refs/heads/master'),
  2065. ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
  2066. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2067. ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
  2068. ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
  2069. self.mock(git_cl, 'get_cl_statuses',
  2070. lambda branches, fine_grained, max_processes:
  2071. [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
  2072. self.assertEqual(1, git_cl.main(['archive', '-f']))
  2073. def test_archive_dry_run(self):
  2074. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2075. self.calls = \
  2076. [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2077. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  2078. ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
  2079. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2080. ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
  2081. ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
  2082. ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
  2083. ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
  2084. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
  2085. self.mock(git_cl, 'get_cl_statuses',
  2086. lambda branches, fine_grained, max_processes:
  2087. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  2088. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2089. (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
  2090. self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
  2091. def test_archive_no_tags(self):
  2092. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2093. self.calls = \
  2094. [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2095. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  2096. ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
  2097. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2098. ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
  2099. ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
  2100. ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
  2101. ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
  2102. ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
  2103. ((['git', 'branch', '-D', 'foo'],), '')]
  2104. self.mock(git_cl, 'get_cl_statuses',
  2105. lambda branches, fine_grained, max_processes:
  2106. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  2107. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2108. (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
  2109. self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
  2110. def test_cmd_issue_erase_existing(self):
  2111. out = StringIO.StringIO()
  2112. self.mock(git_cl.sys, 'stdout', out)
  2113. self.calls = [
  2114. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2115. ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
  2116. ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
  2117. # Let this command raise exception (retcode=1) - it should be ignored.
  2118. ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
  2119. CERR1),
  2120. ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
  2121. ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
  2122. ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
  2123. ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
  2124. ''),
  2125. ]
  2126. self.assertEqual(0, git_cl.main(['issue', '0']))
  2127. def test_cmd_issue_json(self):
  2128. out = StringIO.StringIO()
  2129. self.mock(git_cl.sys, 'stdout', out)
  2130. self.calls = [
  2131. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2132. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  2133. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  2134. ((['git', 'config', 'rietveld.server'],),
  2135. 'https://codereview.chromium.org'),
  2136. ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
  2137. (('write_json', 'output.json',
  2138. {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
  2139. ''),
  2140. ]
  2141. self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
  2142. def test_git_cl_try_default_cq_dry_run(self):
  2143. self.mock(git_cl.Changelist, 'GetChange',
  2144. lambda _, *a: (
  2145. self._mocked_call(['GetChange']+list(a))))
  2146. self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
  2147. lambda *_, **__: (
  2148. self._mocked_call(['DoGetTryMasters'])))
  2149. self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
  2150. lambda _, s: self._mocked_call(['SetCQState', s]))
  2151. self.calls = [
  2152. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2153. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  2154. ((['git', 'config', 'rietveld.autoupdate'],), ''),
  2155. ((['git', 'config', 'rietveld.server'],),
  2156. 'https://codereview.chromium.org'),
  2157. ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
  2158. ((['git', 'config', 'branch.feature.merge'],), 'feature'),
  2159. ((['git', 'config', 'branch.feature.remote'],), 'origin'),
  2160. ((['get_or_create_merge_base', 'feature', 'feature'],),
  2161. 'fake_ancestor_sha'),
  2162. ((['GetChange', 'fake_ancestor_sha', None], ),
  2163. git_cl.presubmit_support.GitChange(
  2164. '', '', '', '', '', '', '', '')),
  2165. ((['git', 'rev-parse', '--show-cdup'],), '../'),
  2166. ((['DoGetTryMasters'], ), None),
  2167. ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
  2168. ]
  2169. out = StringIO.StringIO()
  2170. self.mock(git_cl.sys, 'stdout', out)
  2171. self.assertEqual(0, git_cl.main(['try']))
  2172. self.assertEqual(
  2173. out.getvalue(),
  2174. 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
  2175. def test_git_cl_try_default_cq_dry_run_gerrit(self):
  2176. self.mock(git_cl.Changelist, 'GetChange',
  2177. lambda _, *a: (
  2178. self._mocked_call(['GetChange']+list(a))))
  2179. self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
  2180. lambda *_, **__: (
  2181. self._mocked_call(['DoGetTryMasters'])))
  2182. self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
  2183. lambda _, s: self._mocked_call(['SetCQState', s]))
  2184. def _GetChangeDetail(gerrit_change_list_impl, opts=None):
  2185. # Get realistic expectations.
  2186. gerrit_change_list_impl._GetGerritHost()
  2187. return self._mocked_call(['_GetChangeDetail', opts or []])
  2188. self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
  2189. _GetChangeDetail)
  2190. self.calls = [
  2191. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2192. ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
  2193. ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
  2194. ((['git', 'config', 'branch.feature.gerritserver'],),
  2195. 'https://chromium-review.googlesource.com'),
  2196. ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
  2197. ((['git', 'config', 'branch.feature.merge'],), 'feature'),
  2198. ((['git', 'config', 'branch.feature.remote'],), 'origin'),
  2199. ((['get_or_create_merge_base', 'feature', 'feature'],),
  2200. 'fake_ancestor_sha'),
  2201. ((['GetChange', 'fake_ancestor_sha', None], ),
  2202. git_cl.presubmit_support.GitChange(
  2203. '', '', '', '', '', '', '', '')),
  2204. ((['git', 'rev-parse', '--show-cdup'],), '../'),
  2205. ((['DoGetTryMasters'], ), None),
  2206. ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
  2207. ]
  2208. out = StringIO.StringIO()
  2209. self.mock(git_cl.sys, 'stdout', out)
  2210. self.assertEqual(0, git_cl.main(['try']))
  2211. self.assertEqual(
  2212. out.getvalue(),
  2213. 'scheduled CQ Dry Run on '
  2214. 'https://chromium-review.googlesource.com/123456\n')
  2215. def test_git_cl_try_buildbucket_with_properties_rietveld(self):
  2216. self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
  2217. lambda _: {
  2218. 'owner_email': 'owner@e.mail',
  2219. 'private': False,
  2220. 'closed': False,
  2221. 'project': 'depot_tools',
  2222. 'patchsets': [20001],
  2223. })
  2224. self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
  2225. self.calls = [
  2226. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2227. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  2228. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2229. ((['git', 'config', 'rietveld.server'],),
  2230. 'https://codereview.chromium.org'),
  2231. ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
  2232. ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
  2233. ]
  2234. def _buildbucket_retry(*_, **kw):
  2235. # self.maxDiff = 10000
  2236. body = json.loads(kw['body'])
  2237. self.assertEqual(len(body['builds']), 1)
  2238. build = body['builds'][0]
  2239. params = json.loads(build.pop('parameters_json'))
  2240. self.assertEqual(params, {
  2241. u'builder_name': u'win',
  2242. u'changes': [{u'author': {u'email': u'owner@e.mail'},
  2243. u'revision': None}],
  2244. u'properties': {
  2245. u'category': u'git_cl_try',
  2246. u'issue': 123,
  2247. u'key': u'val',
  2248. u'json': [{u'a': 1}, None],
  2249. u'master': u'tryserver.chromium',
  2250. u'patch_project': u'depot_tools',
  2251. u'patch_storage': u'rietveld',
  2252. u'patchset': 20001,
  2253. u'rietveld': u'https://codereview.chromium.org',
  2254. }
  2255. })
  2256. self.assertEqual(build, {
  2257. u'bucket': u'master.tryserver.chromium',
  2258. u'client_operation_id': u'uuid4',
  2259. u'tags': [u'builder:win',
  2260. u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
  2261. u'user_agent:git_cl_try',
  2262. u'master:tryserver.chromium'],
  2263. })
  2264. self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
  2265. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2266. self.assertEqual(0, git_cl.main([
  2267. 'try', '-m', 'tryserver.chromium', '-b', 'win',
  2268. '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
  2269. self.assertRegexpMatches(
  2270. git_cl.sys.stdout.getvalue(),
  2271. 'Tried jobs on:\nBucket: master.tryserver.chromium')
  2272. def test_git_cl_try_buildbucket_with_properties_gerrit(self):
  2273. self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
  2274. self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
  2275. def _GetChangeDetail(gerrit_change_list_impl, opts=None):
  2276. # Get realistic expectations.
  2277. gerrit_change_list_impl._GetGerritHost()
  2278. return self._mocked_call(['_GetChangeDetail', opts or []])
  2279. self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
  2280. _GetChangeDetail)
  2281. self.calls = [
  2282. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2283. ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
  2284. ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
  2285. ((['git', 'config', 'branch.feature.gerritserver'],),
  2286. 'https://chromium-review.googlesource.com'),
  2287. ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
  2288. ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
  2289. {'owner': {'email': 'owner@e.mail'}}),
  2290. ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
  2291. 'project': 'depot_tools',
  2292. 'revisions': {
  2293. 'deadbeaf': {
  2294. '_number': 6,
  2295. },
  2296. 'beeeeeef': {
  2297. '_number': 7,
  2298. 'fetch': {'http': {
  2299. 'url': 'https://chromium.googlesource.com/depot_tools',
  2300. 'ref': 'refs/changes/56/123456/7'
  2301. }},
  2302. },
  2303. },
  2304. }),
  2305. ]
  2306. def _buildbucket_retry(*_, **kw):
  2307. # self.maxDiff = 10000
  2308. body = json.loads(kw['body'])
  2309. self.assertEqual(len(body['builds']), 1)
  2310. build = body['builds'][0]
  2311. params = json.loads(build.pop('parameters_json'))
  2312. self.assertEqual(params, {
  2313. u'builder_name': u'win',
  2314. u'changes': [{u'author': {u'email': u'owner@e.mail'},
  2315. u'revision': None}],
  2316. u'properties': {
  2317. u'category': u'git_cl_try',
  2318. u'key': u'val',
  2319. u'json': [{u'a': 1}, None],
  2320. u'master': u'tryserver.chromium',
  2321. u'patch_gerrit_url':
  2322. u'https://chromium-review.googlesource.com',
  2323. u'patch_issue': 123456,
  2324. u'patch_project': u'depot_tools',
  2325. u'patch_ref': u'refs/changes/56/123456/7',
  2326. u'patch_repository_url':
  2327. u'https://chromium.googlesource.com/depot_tools',
  2328. u'patch_set': 7,
  2329. u'patch_storage': u'gerrit',
  2330. }
  2331. })
  2332. self.assertEqual(build, {
  2333. u'bucket': u'master.tryserver.chromium',
  2334. u'client_operation_id': u'uuid4',
  2335. u'tags': [
  2336. u'builder:win',
  2337. u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
  2338. u'user_agent:git_cl_try',
  2339. u'master:tryserver.chromium'],
  2340. })
  2341. self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
  2342. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2343. self.assertEqual(0, git_cl.main([
  2344. 'try', '-m', 'tryserver.chromium', '-b', 'win',
  2345. '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
  2346. self.assertRegexpMatches(
  2347. git_cl.sys.stdout.getvalue(),
  2348. 'Tried jobs on:\nBucket: master.tryserver.chromium')
  2349. def test_git_cl_try_buildbucket_bucket_flag(self):
  2350. self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
  2351. lambda _: {
  2352. 'owner_email': 'owner@e.mail',
  2353. 'private': False,
  2354. 'closed': False,
  2355. 'project': 'depot_tools',
  2356. 'patchsets': [20001],
  2357. })
  2358. self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
  2359. self.calls = [
  2360. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2361. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  2362. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2363. ((['git', 'config', 'rietveld.server'],),
  2364. 'https://codereview.chromium.org'),
  2365. ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
  2366. ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
  2367. ]
  2368. def _buildbucket_retry(*_, **kw):
  2369. body = json.loads(kw['body'])
  2370. self.assertEqual(len(body['builds']), 1)
  2371. build = body['builds'][0]
  2372. params = json.loads(build.pop('parameters_json'))
  2373. self.assertEqual(params, {
  2374. u'builder_name': u'win',
  2375. u'changes': [{u'author': {u'email': u'owner@e.mail'},
  2376. u'revision': None}],
  2377. u'properties': {
  2378. u'category': u'git_cl_try',
  2379. u'issue': 123,
  2380. u'patch_project': u'depot_tools',
  2381. u'patch_storage': u'rietveld',
  2382. u'patchset': 20001,
  2383. u'rietveld': u'https://codereview.chromium.org',
  2384. }
  2385. })
  2386. self.assertEqual(build, {
  2387. u'bucket': u'test.bucket',
  2388. u'client_operation_id': u'uuid4',
  2389. u'tags': [u'builder:win',
  2390. u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
  2391. u'user_agent:git_cl_try'],
  2392. })
  2393. self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
  2394. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2395. self.assertEqual(0, git_cl.main([
  2396. 'try', '-B', 'test.bucket', '-b', 'win']))
  2397. self.assertRegexpMatches(
  2398. git_cl.sys.stdout.getvalue(),
  2399. 'Tried jobs on:\nBucket: test.bucket')
  2400. def test_git_cl_try_bots_on_multiple_masters(self):
  2401. self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
  2402. self.calls = [
  2403. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2404. ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
  2405. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2406. ((['git', 'config', 'rietveld.server'],),
  2407. 'https://codereview.chromium.org'),
  2408. ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
  2409. ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
  2410. ]
  2411. def _buildbucket_retry(*_, **kw):
  2412. body = json.loads(kw['body'])
  2413. self.assertEqual(len(body['builds']), 2)
  2414. first_build_params = json.loads(body['builds'][0]['parameters_json'])
  2415. self.assertEqual(first_build_params['builder_name'], 'builder1')
  2416. self.assertEqual(first_build_params['properties']['master'], 'master1')
  2417. first_build_params = json.loads(body['builds'][1]['parameters_json'])
  2418. self.assertEqual(first_build_params['builder_name'], 'builder2')
  2419. self.assertEqual(first_build_params['properties']['master'], 'master2')
  2420. self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
  2421. self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
  2422. json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
  2423. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2424. self.assertEqual(
  2425. 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
  2426. self.assertEqual(
  2427. git_cl.sys.stdout.getvalue(),
  2428. 'Tried jobs on:\n'
  2429. 'Bucket: master.master1\n'
  2430. ' builder1: []\n'
  2431. 'Bucket: master.master2\n'
  2432. ' builder2: []\n'
  2433. 'To see results here, run: git cl try-results\n'
  2434. 'To see results in browser, run: git cl web\n')
  2435. def _common_GerritCommitMsgHookCheck(self):
  2436. self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
  2437. self.mock(git_cl.os.path, 'abspath',
  2438. lambda path: self._mocked_call(['abspath', path]))
  2439. self.mock(git_cl.os.path, 'exists',
  2440. lambda path: self._mocked_call(['exists', path]))
  2441. self.mock(git_cl.gclient_utils, 'FileRead',
  2442. lambda path: self._mocked_call(['FileRead', path]))
  2443. self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
  2444. lambda path: self._mocked_call(['rm_file_or_tree', path]))
  2445. self.calls = [
  2446. ((['git', 'rev-parse', '--show-cdup'],), '../'),
  2447. ((['abspath', '../'],), '/abs/git_repo_root'),
  2448. ]
  2449. return git_cl.Changelist(codereview='gerrit', issue=123)
  2450. def test_GerritCommitMsgHookCheck_custom_hook(self):
  2451. cl = self._common_GerritCommitMsgHookCheck()
  2452. self.calls += [
  2453. ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
  2454. ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
  2455. '#!/bin/sh\necho "custom hook"')
  2456. ]
  2457. cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
  2458. def test_GerritCommitMsgHookCheck_not_exists(self):
  2459. cl = self._common_GerritCommitMsgHookCheck()
  2460. self.calls += [
  2461. ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
  2462. ]
  2463. cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
  2464. def test_GerritCommitMsgHookCheck(self):
  2465. cl = self._common_GerritCommitMsgHookCheck()
  2466. self.calls += [
  2467. ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
  2468. ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
  2469. '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
  2470. (('Do you want to remove it now? [Yes/No]',), 'Yes'),
  2471. ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
  2472. ''),
  2473. ]
  2474. cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
  2475. def test_GerritCmdLand(self):
  2476. self.calls += [
  2477. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2478. ((['git', 'config', 'branch.feature.gerritsquashhash'],),
  2479. 'deadbeaf'),
  2480. ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
  2481. ((['git', 'config', 'branch.feature.gerritserver'],),
  2482. 'chromium-review.googlesource.com'),
  2483. ]
  2484. cl = git_cl.Changelist(issue=123, codereview='gerrit')
  2485. cl._codereview_impl._GetChangeDetail = lambda _: {
  2486. 'labels': {},
  2487. 'current_revision': 'deadbeaf',
  2488. }
  2489. cl._codereview_impl._GetChangeCommit = lambda: {
  2490. 'commit': 'deadbeef',
  2491. 'web_links': [{'name': 'gitiles',
  2492. 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
  2493. }
  2494. cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
  2495. out = StringIO.StringIO()
  2496. self.mock(sys, 'stdout', out)
  2497. self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
  2498. self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
  2499. self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
  2500. BUILDBUCKET_BUILDS_MAP = {
  2501. '9000': {
  2502. 'id': '9000',
  2503. 'status': 'STARTED',
  2504. 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
  2505. 'result_details_json': '{"properties": {}}',
  2506. 'bucket': 'master.x.y',
  2507. 'created_by': 'user:someone@chromium.org',
  2508. 'created_ts': '147200002222000',
  2509. 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
  2510. },
  2511. '8000': {
  2512. 'id': '8000',
  2513. 'status': 'COMPLETED',
  2514. 'result': 'FAILURE',
  2515. 'failure_reason': 'BUILD_FAILURE',
  2516. 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
  2517. 'result_details_json': '{"properties": {}}',
  2518. 'bucket': 'master.x.y',
  2519. 'created_by': 'user:someone@chromium.org',
  2520. 'created_ts': '147200001111000',
  2521. 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
  2522. },
  2523. }
  2524. def test_write_try_results_json(self):
  2525. expected_output = [
  2526. {
  2527. 'buildbucket_id': '8000',
  2528. 'bucket': 'master.x.y',
  2529. 'builder_name': 'my-builder',
  2530. 'status': 'COMPLETED',
  2531. 'result': 'FAILURE',
  2532. 'failure_reason': 'BUILD_FAILURE',
  2533. 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
  2534. },
  2535. {
  2536. 'buildbucket_id': '9000',
  2537. 'bucket': 'master.x.y',
  2538. 'builder_name': 'my-builder',
  2539. 'status': 'STARTED',
  2540. 'result': None,
  2541. 'failure_reason': None,
  2542. 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
  2543. }
  2544. ]
  2545. self.calls = [(('write_json', 'output.json', expected_output), '')]
  2546. git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
  2547. def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
  2548. out = StringIO.StringIO()
  2549. self.mock(sys, 'stdout', out)
  2550. self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
  2551. lambda *args: most_recent_patchset)
  2552. self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
  2553. self._mocked_call(['get_authenticator_for_host', host]))
  2554. self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
  2555. self._mocked_call(['_buildbucket_retry']))
  2556. def _setup_fetch_try_jobs_rietveld(self, *request_results):
  2557. self._setup_fetch_try_jobs(most_recent_patchset=20001)
  2558. self.calls += [
  2559. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2560. ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
  2561. ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
  2562. ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
  2563. ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
  2564. ((['git', 'config', 'branch.feature.rietveldserver'],),
  2565. 'codereview.example.com'),
  2566. ((['get_authenticator_for_host', 'codereview.example.com'],),
  2567. AuthenticatorMock()),
  2568. ] + [((['_buildbucket_retry'],), r) for r in request_results]
  2569. def test_fetch_try_jobs_none_rietveld(self):
  2570. self._setup_fetch_try_jobs_rietveld({})
  2571. # Simulate that user isn't logged in.
  2572. self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
  2573. self.assertEqual(0, git_cl.main(['try-results']))
  2574. self.assertRegexpMatches(sys.stdout.getvalue(),
  2575. 'Warning: Some results might be missing')
  2576. self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
  2577. def test_fetch_try_jobs_some_rietveld(self):
  2578. self._setup_fetch_try_jobs_rietveld({
  2579. 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
  2580. })
  2581. self.assertEqual(0, git_cl.main(['try-results']))
  2582. self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
  2583. self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
  2584. self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
  2585. def _setup_fetch_try_jobs_gerrit(self, *request_results):
  2586. self._setup_fetch_try_jobs(most_recent_patchset=13)
  2587. self.calls += [
  2588. ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
  2589. ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
  2590. ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
  2591. # TODO(tandrii): Uncomment the below if we decide to support checking
  2592. # patchsets for Gerrit.
  2593. # Simulate that Gerrit has more patchsets than local.
  2594. # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
  2595. ((['git', 'config', 'branch.feature.gerritserver'],),
  2596. 'https://x-review.googlesource.com'),
  2597. ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
  2598. AuthenticatorMock()),
  2599. ] + [((['_buildbucket_retry'],), r) for r in request_results]
  2600. def test_fetch_try_jobs_none_gerrit(self):
  2601. self._setup_fetch_try_jobs_gerrit({})
  2602. self.assertEqual(0, git_cl.main(['try-results']))
  2603. # TODO(tandrii): Uncomment the below if we decide to support checking
  2604. # patchsets for Gerrit.
  2605. # self.assertRegexpMatches(
  2606. # sys.stdout.getvalue(),
  2607. # r'Warning: Codereview server has newer patchsets \(13\)')
  2608. self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
  2609. def test_fetch_try_jobs_some_gerrit(self):
  2610. self._setup_fetch_try_jobs_gerrit({
  2611. 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
  2612. })
  2613. # TODO(tandrii): Uncomment the below if we decide to support checking
  2614. # patchsets for Gerrit.
  2615. # self.calls.remove(
  2616. # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
  2617. self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
  2618. # ... and doesn't result in warning.
  2619. self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
  2620. self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
  2621. self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
  2622. self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
  2623. if __name__ == '__main__':
  2624. git_cl.logging.basicConfig(
  2625. level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
  2626. unittest.main()