git_cl_test.py 194 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720172117221723172417251726172717281729173017311732173317341735173617371738173917401741174217431744174517461747174817491750175117521753175417551756175717581759176017611762176317641765176617671768176917701771177217731774177517761777177817791780178117821783178417851786178717881789179017911792179317941795179617971798179918001801180218031804180518061807180818091810181118121813181418151816181718181819182018211822182318241825182618271828182918301831183218331834183518361837183818391840184118421843184418451846184718481849185018511852185318541855185618571858185918601861186218631864186518661867186818691870187118721873187418751876187718781879188018811882188318841885188618871888188918901891189218931894189518961897189818991900190119021903190419051906190719081909191019111912191319141915191619171918191919201921192219231924192519261927192819291930193119321933193419351936193719381939194019411942194319441945194619471948194919501951195219531954195519561957195819591960196119621963196419651966196719681969197019711972197319741975197619771978197919801981198219831984198519861987198819891990199119921993199419951996199719981999200020012002200320042005200620072008200920102011201220132014201520162017201820192020202120222023202420252026202720282029203020312032203320342035203620372038203920402041204220432044204520462047204820492050205120522053205420552056205720582059206020612062206320642065206620672068206920702071207220732074207520762077207820792080208120822083208420852086208720882089209020912092209320942095209620972098209921002101210221032104210521062107210821092110211121122113211421152116211721182119212021212122212321242125212621272128212921302131213221332134213521362137213821392140214121422143214421452146214721482149215021512152215321542155215621572158215921602161216221632164216521662167216821692170217121722173217421752176217721782179218021812182218321842185218621872188218921902191219221932194219521962197219821992200220122022203220422052206220722082209221022112212221322142215221622172218221922202221222222232224222522262227222822292230223122322233223422352236223722382239224022412242224322442245224622472248224922502251225222532254225522562257225822592260226122622263226422652266226722682269227022712272227322742275227622772278227922802281228222832284228522862287228822892290229122922293229422952296229722982299230023012302230323042305230623072308230923102311231223132314231523162317231823192320232123222323232423252326232723282329233023312332233323342335233623372338233923402341234223432344234523462347234823492350235123522353235423552356235723582359236023612362236323642365236623672368236923702371237223732374237523762377237823792380238123822383238423852386238723882389239023912392239323942395239623972398239924002401240224032404240524062407240824092410241124122413241424152416241724182419242024212422242324242425242624272428242924302431243224332434243524362437243824392440244124422443244424452446244724482449245024512452245324542455245624572458245924602461246224632464246524662467246824692470247124722473247424752476247724782479248024812482248324842485248624872488248924902491249224932494249524962497249824992500250125022503250425052506250725082509251025112512251325142515251625172518251925202521252225232524252525262527252825292530253125322533253425352536253725382539254025412542254325442545254625472548254925502551255225532554255525562557255825592560256125622563256425652566256725682569257025712572257325742575257625772578257925802581258225832584258525862587258825892590259125922593259425952596259725982599260026012602260326042605260626072608260926102611261226132614261526162617261826192620262126222623262426252626262726282629263026312632263326342635263626372638263926402641264226432644264526462647264826492650265126522653265426552656265726582659266026612662266326642665266626672668266926702671267226732674267526762677267826792680268126822683268426852686268726882689269026912692269326942695269626972698269927002701270227032704270527062707270827092710271127122713271427152716271727182719272027212722272327242725272627272728272927302731273227332734273527362737273827392740274127422743274427452746274727482749275027512752275327542755275627572758275927602761276227632764276527662767276827692770277127722773277427752776277727782779278027812782278327842785278627872788278927902791279227932794279527962797279827992800280128022803280428052806280728082809281028112812281328142815281628172818281928202821282228232824282528262827282828292830283128322833283428352836283728382839284028412842284328442845284628472848284928502851285228532854285528562857285828592860286128622863286428652866286728682869287028712872287328742875287628772878287928802881288228832884288528862887288828892890289128922893289428952896289728982899290029012902290329042905290629072908290929102911291229132914291529162917291829192920292129222923292429252926292729282929293029312932293329342935293629372938293929402941294229432944294529462947294829492950295129522953295429552956295729582959296029612962296329642965296629672968296929702971297229732974297529762977297829792980298129822983298429852986298729882989299029912992299329942995299629972998299930003001300230033004300530063007300830093010301130123013301430153016301730183019302030213022302330243025302630273028302930303031303230333034303530363037303830393040304130423043304430453046304730483049305030513052305330543055305630573058305930603061306230633064306530663067306830693070307130723073307430753076307730783079308030813082308330843085308630873088308930903091309230933094309530963097309830993100310131023103310431053106310731083109311031113112311331143115311631173118311931203121312231233124312531263127312831293130313131323133313431353136313731383139314031413142314331443145314631473148314931503151315231533154315531563157315831593160316131623163316431653166316731683169317031713172317331743175317631773178317931803181318231833184318531863187318831893190319131923193319431953196319731983199320032013202320332043205320632073208320932103211321232133214321532163217321832193220322132223223322432253226322732283229323032313232323332343235323632373238323932403241324232433244324532463247324832493250325132523253325432553256325732583259326032613262326332643265326632673268326932703271327232733274327532763277327832793280328132823283328432853286328732883289329032913292329332943295329632973298329933003301330233033304330533063307330833093310331133123313331433153316331733183319332033213322332333243325332633273328332933303331333233333334333533363337333833393340334133423343334433453346334733483349335033513352335333543355335633573358335933603361336233633364336533663367336833693370337133723373337433753376337733783379338033813382338333843385338633873388338933903391339233933394339533963397339833993400340134023403340434053406340734083409341034113412341334143415341634173418341934203421342234233424342534263427342834293430343134323433343434353436343734383439344034413442344334443445344634473448344934503451345234533454345534563457345834593460346134623463346434653466346734683469347034713472347334743475347634773478347934803481348234833484348534863487348834893490349134923493349434953496349734983499350035013502350335043505350635073508350935103511351235133514351535163517351835193520352135223523352435253526352735283529353035313532353335343535353635373538353935403541354235433544354535463547354835493550355135523553355435553556355735583559356035613562356335643565356635673568356935703571357235733574357535763577357835793580358135823583358435853586358735883589359035913592359335943595359635973598359936003601360236033604360536063607360836093610361136123613361436153616361736183619362036213622362336243625362636273628362936303631363236333634363536363637363836393640364136423643364436453646364736483649365036513652365336543655365636573658365936603661366236633664366536663667366836693670367136723673367436753676367736783679368036813682368336843685368636873688368936903691369236933694369536963697369836993700370137023703370437053706370737083709371037113712371337143715371637173718371937203721372237233724372537263727372837293730373137323733373437353736373737383739374037413742374337443745374637473748374937503751375237533754375537563757375837593760376137623763376437653766376737683769377037713772377337743775377637773778377937803781378237833784378537863787378837893790379137923793379437953796379737983799380038013802380338043805380638073808380938103811381238133814381538163817381838193820382138223823382438253826382738283829383038313832383338343835383638373838383938403841384238433844384538463847384838493850385138523853385438553856385738583859386038613862386338643865386638673868386938703871387238733874387538763877387838793880388138823883388438853886388738883889389038913892389338943895389638973898389939003901390239033904390539063907390839093910391139123913391439153916391739183919392039213922392339243925392639273928392939303931393239333934393539363937393839393940394139423943394439453946394739483949395039513952395339543955395639573958395939603961396239633964396539663967396839693970397139723973397439753976397739783979398039813982398339843985398639873988398939903991399239933994399539963997399839994000400140024003400440054006400740084009401040114012401340144015401640174018401940204021402240234024402540264027402840294030403140324033403440354036403740384039404040414042404340444045404640474048404940504051405240534054405540564057405840594060406140624063406440654066406740684069407040714072407340744075407640774078407940804081408240834084408540864087408840894090409140924093409440954096409740984099410041014102410341044105410641074108410941104111411241134114411541164117411841194120412141224123412441254126412741284129413041314132413341344135413641374138413941404141414241434144414541464147414841494150415141524153415441554156415741584159416041614162416341644165416641674168416941704171417241734174417541764177417841794180418141824183418441854186418741884189419041914192419341944195419641974198419942004201420242034204420542064207420842094210421142124213421442154216421742184219422042214222422342244225422642274228422942304231423242334234423542364237423842394240424142424243424442454246424742484249425042514252425342544255425642574258425942604261426242634264426542664267426842694270427142724273427442754276427742784279428042814282428342844285428642874288428942904291429242934294429542964297429842994300430143024303430443054306430743084309431043114312431343144315431643174318431943204321432243234324432543264327432843294330433143324333433443354336433743384339434043414342434343444345434643474348434943504351435243534354435543564357435843594360436143624363436443654366436743684369437043714372437343744375437643774378437943804381438243834384438543864387438843894390439143924393439443954396439743984399440044014402440344044405440644074408440944104411441244134414441544164417441844194420442144224423442444254426442744284429443044314432443344344435443644374438443944404441444244434444444544464447444844494450445144524453445444554456445744584459446044614462446344644465446644674468446944704471447244734474447544764477447844794480448144824483448444854486448744884489449044914492449344944495449644974498449945004501450245034504450545064507450845094510451145124513451445154516451745184519452045214522452345244525452645274528452945304531453245334534453545364537453845394540454145424543454445454546454745484549455045514552455345544555455645574558455945604561456245634564456545664567456845694570457145724573457445754576457745784579458045814582458345844585458645874588458945904591459245934594459545964597459845994600460146024603460446054606460746084609461046114612461346144615461646174618461946204621462246234624462546264627462846294630463146324633463446354636463746384639464046414642464346444645464646474648464946504651465246534654465546564657465846594660466146624663466446654666466746684669467046714672467346744675467646774678467946804681468246834684468546864687468846894690469146924693469446954696469746984699470047014702470347044705470647074708470947104711471247134714471547164717471847194720472147224723472447254726472747284729473047314732473347344735473647374738473947404741474247434744474547464747474847494750475147524753475447554756475747584759476047614762476347644765476647674768476947704771477247734774477547764777477847794780478147824783478447854786478747884789479047914792479347944795479647974798479948004801480248034804480548064807480848094810481148124813481448154816481748184819482048214822482348244825482648274828482948304831483248334834483548364837483848394840484148424843484448454846484748484849485048514852485348544855485648574858485948604861486248634864486548664867486848694870487148724873487448754876487748784879488048814882488348844885488648874888488948904891489248934894489548964897489848994900490149024903490449054906490749084909491049114912491349144915491649174918491949204921492249234924492549264927492849294930493149324933493449354936493749384939494049414942494349444945494649474948494949504951495249534954495549564957495849594960496149624963496449654966496749684969497049714972497349744975497649774978497949804981498249834984498549864987498849894990499149924993499449954996499749984999500050015002500350045005500650075008500950105011501250135014501550165017501850195020502150225023502450255026502750285029503050315032503350345035503650375038503950405041504250435044504550465047504850495050505150525053505450555056505750585059506050615062506350645065506650675068506950705071507250735074507550765077507850795080508150825083508450855086508750885089509050915092509350945095509650975098509951005101510251035104510551065107510851095110511151125113511451155116511751185119512051215122512351245125512651275128512951305131513251335134513551365137513851395140514151425143514451455146514751485149515051515152515351545155515651575158515951605161516251635164516551665167516851695170517151725173517451755176517751785179518051815182518351845185518651875188518951905191519251935194519551965197519851995200520152025203520452055206520752085209521052115212521352145215521652175218521952205221522252235224522552265227522852295230523152325233523452355236523752385239524052415242524352445245524652475248524952505251525252535254525552565257525852595260526152625263526452655266526752685269527052715272527352745275527652775278
  1. #!/usr/bin/env vpython3
  2. # coding=utf-8
  3. # Copyright (c) 2012 The Chromium Authors. All rights reserved.
  4. # Use of this source code is governed by a BSD-style license that can be
  5. # found in the LICENSE file.
  6. """Unit tests for git_cl.py."""
  7. import datetime
  8. import json
  9. import logging
  10. from io import StringIO
  11. import multiprocessing
  12. import optparse
  13. import os
  14. import shutil
  15. import sys
  16. import tempfile
  17. import unittest
  18. from unittest import mock
  19. sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
  20. import metrics
  21. import metrics_utils
  22. # We have to disable monitoring before importing git_cl.
  23. metrics_utils.COLLECT_METRICS = False
  24. import clang_format
  25. import contextlib
  26. import gclient_utils
  27. import gerrit_util
  28. import git_cl
  29. import git_common
  30. import git_footers
  31. import git_new_branch
  32. import owners_client
  33. import scm
  34. import subprocess2
  35. NETRC_FILENAME = '_netrc' if sys.platform == 'win32' else '.netrc'
  36. def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''):
  37. return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
  38. CERR1 = callError(1)
  39. class TemporaryFileMock(object):
  40. def __init__(self):
  41. self.suffix = 0
  42. @contextlib.contextmanager
  43. def __call__(self):
  44. self.suffix += 1
  45. yield '/tmp/fake-temp' + str(self.suffix)
  46. class ChangelistMock(object):
  47. # A class variable so we can access it when we don't have access to the
  48. # instance that's being set.
  49. desc = ''
  50. def __init__(self, gerrit_change=None, use_python3=False, **kwargs):
  51. self._gerrit_change = gerrit_change
  52. self._use_python3 = use_python3
  53. def GetIssue(self):
  54. return 1
  55. def FetchDescription(self):
  56. return ChangelistMock.desc
  57. def UpdateDescription(self, desc, force=False):
  58. ChangelistMock.desc = desc
  59. def GetGerritChange(self, patchset=None, **kwargs):
  60. del patchset
  61. return self._gerrit_change
  62. def GetRemoteBranch(self):
  63. return ('origin', 'refs/remotes/origin/main')
  64. class GitMocks(object):
  65. def __init__(self, config=None, branchref=None):
  66. self.branchref = branchref or 'refs/heads/main'
  67. self.config = config or {}
  68. def GetBranchRef(self, _root):
  69. return self.branchref
  70. def NewBranch(self, branchref):
  71. self.branchref = branchref
  72. def GetConfig(self, root, key, default=None):
  73. if root != '':
  74. key = '%s:%s' % (root, key)
  75. return self.config.get(key, default)
  76. def SetConfig(self, root, key, value=None):
  77. if root != '':
  78. key = '%s:%s' % (root, key)
  79. if value:
  80. self.config[key] = value
  81. return
  82. if key not in self.config:
  83. raise CERR1
  84. del self.config[key]
  85. class WatchlistsMock(object):
  86. def __init__(self, _):
  87. pass
  88. @staticmethod
  89. def GetWatchersForPaths(_):
  90. return ['joe@example.com']
  91. class CodereviewSettingsFileMock(object):
  92. def __init__(self):
  93. pass
  94. # pylint: disable=no-self-use
  95. def read(self):
  96. return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' +
  97. 'GERRIT_HOST: True\n')
  98. class AuthenticatorMock(object):
  99. def __init__(self, *_args):
  100. pass
  101. def has_cached_credentials(self):
  102. return True
  103. def authorize(self, http):
  104. return http
  105. def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
  106. """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
  107. Usage:
  108. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  109. CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
  110. OR
  111. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  112. CookiesAuthenticatorMockFactory(
  113. same_auth=('user', '', 'pass'))
  114. """
  115. class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
  116. def __init__(self): # pylint: disable=super-init-not-called
  117. # Intentionally not calling super() because it reads actual cookie files.
  118. pass
  119. @classmethod
  120. def get_gitcookies_path(cls):
  121. return os.path.join('~', '.gitcookies')
  122. @classmethod
  123. def get_netrc_path(cls):
  124. return os.path.join('~', NETRC_FILENAME)
  125. def _get_auth_for_host(self, host):
  126. if same_auth:
  127. return same_auth
  128. return (hosts_with_creds or {}).get(host)
  129. return CookiesAuthenticatorMock
  130. class MockChangelistWithBranchAndIssue():
  131. def __init__(self, branch, issue):
  132. self.branch = branch
  133. self.issue = issue
  134. def GetBranch(self):
  135. return self.branch
  136. def GetIssue(self):
  137. return self.issue
  138. class SystemExitMock(Exception):
  139. pass
  140. class TestGitClBasic(unittest.TestCase):
  141. def setUp(self):
  142. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  143. mock.patch('sys.stdout', StringIO()).start()
  144. mock.patch('sys.stderr', StringIO()).start()
  145. self.addCleanup(mock.patch.stopall)
  146. def test_die_with_error(self):
  147. with self.assertRaises(SystemExitMock):
  148. git_cl.DieWithError('foo', git_cl.ChangeDescription('lorem ipsum'))
  149. self.assertEqual(sys.stderr.getvalue(), 'foo\n')
  150. self.assertTrue('saving CL description' in sys.stdout.getvalue())
  151. self.assertTrue('Content of CL description' in sys.stdout.getvalue())
  152. self.assertTrue('lorem ipsum' in sys.stdout.getvalue())
  153. sys.exit.assert_called_once_with(1)
  154. def test_die_with_error_no_desc(self):
  155. with self.assertRaises(SystemExitMock):
  156. git_cl.DieWithError('foo')
  157. self.assertEqual(sys.stderr.getvalue(), 'foo\n')
  158. self.assertEqual(sys.stdout.getvalue(), '')
  159. sys.exit.assert_called_once_with(1)
  160. def test_fetch_description(self):
  161. cl = git_cl.Changelist(issue=1, codereview_host='host')
  162. cl.description = 'x'
  163. self.assertEqual(cl.FetchDescription(), 'x')
  164. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  165. @mock.patch('git_cl.Changelist.GetStatus', lambda cl: cl.status)
  166. def test_get_cl_statuses(self, *_mocks):
  167. statuses = [
  168. 'closed', 'commit', 'dry-run', 'lgtm', 'reply', 'unsent', 'waiting']
  169. changes = []
  170. for status in statuses:
  171. cl = git_cl.Changelist()
  172. cl.status = status
  173. changes.append(cl)
  174. actual = set(git_cl.get_cl_statuses(changes, True))
  175. self.assertEqual(set(zip(changes, statuses)), actual)
  176. def test_upload_to_non_default_branch_no_retry(self):
  177. m = mock.patch('git_cl.Changelist._CMDUploadChange',
  178. side_effect=[git_cl.GitPushError(), None]).start()
  179. mock.patch('git_cl.Changelist.GetRemoteBranch',
  180. return_value=('foo', 'bar')).start()
  181. mock.patch('git_cl.Changelist.GetGerritProject',
  182. return_value='foo').start()
  183. mock.patch('git_cl.gerrit_util.GetProjectHead',
  184. return_value='refs/heads/main').start()
  185. cl = git_cl.Changelist()
  186. options = optparse.Values()
  187. options.target_branch = 'refs/heads/bar'
  188. with self.assertRaises(SystemExitMock):
  189. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  190. # ensure upload is called once
  191. self.assertEqual(len(m.mock_calls), 1)
  192. sys.exit.assert_called_once_with(1)
  193. # option not set as retry didn't happen
  194. self.assertFalse(hasattr(options, 'force'))
  195. self.assertFalse(hasattr(options, 'edit_description'))
  196. def test_upload_to_old_default_still_active(self):
  197. m = mock.patch('git_cl.Changelist._CMDUploadChange',
  198. side_effect=[git_cl.GitPushError(), None]).start()
  199. mock.patch('git_cl.Changelist.GetRemoteBranch',
  200. return_value=('foo', git_cl.DEFAULT_OLD_BRANCH)).start()
  201. mock.patch('git_cl.Changelist.GetGerritProject',
  202. return_value='foo').start()
  203. mock.patch('git_cl.gerrit_util.GetProjectHead',
  204. return_value='refs/heads/main').start()
  205. cl = git_cl.Changelist()
  206. options = optparse.Values()
  207. options.target_branch = 'refs/heads/main'
  208. with self.assertRaises(SystemExitMock):
  209. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  210. # ensure upload is called once
  211. self.assertEqual(len(m.mock_calls), 1)
  212. sys.exit.assert_called_once_with(1)
  213. # option not set as retry didn't happen
  214. self.assertFalse(hasattr(options, 'force'))
  215. self.assertFalse(hasattr(options, 'edit_description'))
  216. def test_upload_with_message_file_no_editor(self):
  217. m = mock.patch('git_cl.ChangeDescription.prompt',
  218. return_value=None).start()
  219. mock.patch('git_cl.Changelist.GetRemoteBranch',
  220. return_value=('foo', git_cl.DEFAULT_NEW_BRANCH)).start()
  221. mock.patch('git_cl.GetTargetRef',
  222. return_value='refs/heads/main').start()
  223. mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck', lambda
  224. offer_removal: None).start()
  225. mock.patch('git_cl.Changelist.GetIssue', return_value=None).start()
  226. mock.patch('git_cl.Changelist.GetBranch',
  227. side_effect=SystemExitMock).start()
  228. mock.patch('git_cl.GenerateGerritChangeId', return_value=None).start()
  229. mock.patch('git_cl.RunGit').start()
  230. cl = git_cl.Changelist()
  231. options = optparse.Values()
  232. options.target_branch = 'refs/heads/main'
  233. options.squash = True
  234. options.edit_description = False
  235. options.force = False
  236. options.preserve_tryjobs = False
  237. options.message_file = "message.txt"
  238. with self.assertRaises(SystemExitMock):
  239. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  240. self.assertEqual(len(m.mock_calls), 0)
  241. options.message_file = None
  242. with self.assertRaises(SystemExitMock):
  243. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  244. self.assertEqual(len(m.mock_calls), 1)
  245. def test_get_cl_statuses_no_changes(self):
  246. self.assertEqual([], list(git_cl.get_cl_statuses([], True)))
  247. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  248. @mock.patch('multiprocessing.pool.ThreadPool')
  249. def test_get_cl_statuses_timeout(self, *_mocks):
  250. changes = [git_cl.Changelist() for _ in range(2)]
  251. pool = multiprocessing.pool.ThreadPool()
  252. it = pool.imap_unordered.return_value.__iter__ = mock.Mock()
  253. it.return_value.next.side_effect = [
  254. (changes[0], 'lgtm'),
  255. multiprocessing.TimeoutError,
  256. ]
  257. actual = list(git_cl.get_cl_statuses(changes, True))
  258. self.assertEqual([(changes[0], 'lgtm'), (changes[1], 'error')], actual)
  259. @mock.patch('git_cl.Changelist.GetIssueURL')
  260. def test_get_cl_statuses_not_finegrained(self, _mock):
  261. changes = [git_cl.Changelist() for _ in range(2)]
  262. urls = ['some-url', None]
  263. git_cl.Changelist.GetIssueURL.side_effect = urls
  264. actual = set(git_cl.get_cl_statuses(changes, False))
  265. self.assertEqual(
  266. set([(changes[0], 'waiting'), (changes[1], 'error')]), actual)
  267. def test_get_issue_url(self):
  268. cl = git_cl.Changelist(issue=123)
  269. cl._gerrit_server = 'https://example.com'
  270. self.assertEqual(cl.GetIssueURL(), 'https://example.com/123')
  271. self.assertEqual(cl.GetIssueURL(short=True), 'https://example.com/123')
  272. cl = git_cl.Changelist(issue=123)
  273. cl._gerrit_server = 'https://chromium-review.googlesource.com'
  274. self.assertEqual(cl.GetIssueURL(),
  275. 'https://chromium-review.googlesource.com/123')
  276. self.assertEqual(cl.GetIssueURL(short=True), 'https://crrev.com/c/123')
  277. def test_set_preserve_tryjobs(self):
  278. d = git_cl.ChangeDescription('Simple.')
  279. d.set_preserve_tryjobs()
  280. self.assertEqual(d.description.splitlines(), [
  281. 'Simple.',
  282. '',
  283. 'Cq-Do-Not-Cancel-Tryjobs: true',
  284. ])
  285. before = d.description
  286. d.set_preserve_tryjobs()
  287. self.assertEqual(before, d.description)
  288. d = git_cl.ChangeDescription('\n'.join([
  289. 'One is enough',
  290. '',
  291. 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
  292. 'Change-Id: Ideadbeef',
  293. ]))
  294. d.set_preserve_tryjobs()
  295. self.assertEqual(d.description.splitlines(), [
  296. 'One is enough',
  297. '',
  298. 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
  299. 'Change-Id: Ideadbeef',
  300. 'Cq-Do-Not-Cancel-Tryjobs: true',
  301. ])
  302. def test_get_bug_line_values(self):
  303. f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
  304. self.assertEqual(f('', ''), [])
  305. self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
  306. # Prefix that ends with colon.
  307. self.assertEqual(f('v8:', '456'), ['v8:456'])
  308. self.assertEqual(f('v8:', 'chromium:123,456'), ['v8:456', 'chromium:123'])
  309. # Prefix that ends without colon.
  310. self.assertEqual(f('v8', '456'), ['v8:456'])
  311. self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
  312. # Not nice, but not worth carying.
  313. self.assertEqual(f('v8:', 'chromium:123,456,v8:123'),
  314. ['v8:456', 'chromium:123', 'v8:123'])
  315. self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
  316. ['v8:456', 'chromium:123', 'v8:123'])
  317. @mock.patch('gerrit_util.GetAccountDetails')
  318. def test_valid_accounts(self, mockGetAccountDetails):
  319. mock_per_account = {
  320. 'u1': None, # 404, doesn't exist.
  321. 'u2': {
  322. '_account_id': 123124,
  323. 'avatars': [],
  324. 'email': 'u2@example.com',
  325. 'name': 'User Number 2',
  326. 'status': 'OOO',
  327. },
  328. 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
  329. }
  330. def GetAccountDetailsMock(_, account):
  331. # Poor-man's mock library's side_effect.
  332. v = mock_per_account.pop(account)
  333. if isinstance(v, Exception):
  334. raise v
  335. return v
  336. mockGetAccountDetails.side_effect = GetAccountDetailsMock
  337. actual = git_cl.gerrit_util.ValidAccounts(
  338. 'host', ['u1', 'u2', 'u3'], max_threads=1)
  339. self.assertEqual(actual, {
  340. 'u2': {
  341. '_account_id': 123124,
  342. 'avatars': [],
  343. 'email': 'u2@example.com',
  344. 'name': 'User Number 2',
  345. 'status': 'OOO',
  346. },
  347. })
  348. class TestParseIssueURL(unittest.TestCase):
  349. def _test(self, arg, issue=None, patchset=None, hostname=None, fail=False):
  350. parsed = git_cl.ParseIssueNumberArgument(arg)
  351. self.assertIsNotNone(parsed)
  352. if fail:
  353. self.assertFalse(parsed.valid)
  354. return
  355. self.assertTrue(parsed.valid)
  356. self.assertEqual(parsed.issue, issue)
  357. self.assertEqual(parsed.patchset, patchset)
  358. self.assertEqual(parsed.hostname, hostname)
  359. def test_basic(self):
  360. self._test('123', 123)
  361. self._test('', fail=True)
  362. self._test('abc', fail=True)
  363. self._test('123/1', fail=True)
  364. self._test('123a', fail=True)
  365. self._test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
  366. self._test('ssh://chrome-review.source.com/c/123/1/', fail=True)
  367. def test_gerrit_url(self):
  368. self._test('https://codereview.source.com/123', 123, None,
  369. 'codereview.source.com')
  370. self._test('http://chrome-review.source.com/c/123', 123, None,
  371. 'chrome-review.source.com')
  372. self._test('https://chrome-review.source.com/c/123/', 123, None,
  373. 'chrome-review.source.com')
  374. self._test('https://chrome-review.source.com/c/123/4', 123, 4,
  375. 'chrome-review.source.com')
  376. self._test('https://chrome-review.source.com/#/c/123/4', 123, 4,
  377. 'chrome-review.source.com')
  378. self._test('https://chrome-review.source.com/c/123/4', 123, 4,
  379. 'chrome-review.source.com')
  380. self._test('https://chrome-review.source.com/123', 123, None,
  381. 'chrome-review.source.com')
  382. self._test('https://chrome-review.source.com/123/4', 123, 4,
  383. 'chrome-review.source.com')
  384. self._test('https://chrome-review.source.com/bad/123/4', fail=True)
  385. self._test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
  386. self._test('https://chrome-review.source.com/c/abc/', fail=True)
  387. def test_short_urls(self):
  388. self._test('https://crrev.com/c/2151934', 2151934, None,
  389. 'chromium-review.googlesource.com')
  390. def test_missing_scheme(self):
  391. self._test('codereview.source.com/123', 123, None, 'codereview.source.com')
  392. self._test('crrev.com/c/2151934', 2151934, None,
  393. 'chromium-review.googlesource.com')
  394. class GitCookiesCheckerTest(unittest.TestCase):
  395. def setUp(self):
  396. super(GitCookiesCheckerTest, self).setUp()
  397. self.c = git_cl._GitCookiesChecker()
  398. self.c._all_hosts = []
  399. mock.patch('sys.stdout', StringIO()).start()
  400. self.addCleanup(mock.patch.stopall)
  401. def mock_hosts_creds(self, subhost_identity_pairs):
  402. def ensure_googlesource(h):
  403. if not h.endswith(git_cl._GOOGLESOURCE):
  404. assert not h.endswith('.')
  405. return h + '.' + git_cl._GOOGLESOURCE
  406. return h
  407. self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
  408. for h, i in subhost_identity_pairs]
  409. def test_identity_parsing(self):
  410. self.assertEqual(self.c._parse_identity('ldap.google.com'),
  411. ('ldap', 'google.com'))
  412. self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
  413. ('ldap', 'example.com'))
  414. # Specical case because we know there are no subdomains in chromium.org.
  415. self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
  416. ('note.period', 'chromium.org'))
  417. # Pathological: ".period." can be either username OR domain, more likely
  418. # domain.
  419. self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
  420. ('note', 'period.example.com'))
  421. def test_analysis_nothing(self):
  422. self.c._all_hosts = []
  423. self.assertFalse(self.c.has_generic_host())
  424. self.assertEqual(set(), self.c.get_conflicting_hosts())
  425. self.assertEqual(set(), self.c.get_duplicated_hosts())
  426. self.assertEqual(set(), self.c.get_partially_configured_hosts())
  427. def test_analysis(self):
  428. self.mock_hosts_creds([
  429. ('.googlesource.com', 'git-example.chromium.org'),
  430. ('chromium', 'git-example.google.com'),
  431. ('chromium-review', 'git-example.google.com'),
  432. ('chrome-internal', 'git-example.chromium.org'),
  433. ('chrome-internal-review', 'git-example.chromium.org'),
  434. ('conflict', 'git-example.google.com'),
  435. ('conflict-review', 'git-example.chromium.org'),
  436. ('dup', 'git-example.google.com'),
  437. ('dup', 'git-example.google.com'),
  438. ('dup-review', 'git-example.google.com'),
  439. ('partial', 'git-example.google.com'),
  440. ('gpartial-review', 'git-example.google.com'),
  441. ])
  442. self.assertTrue(self.c.has_generic_host())
  443. self.assertEqual(set(['conflict.googlesource.com']),
  444. self.c.get_conflicting_hosts())
  445. self.assertEqual(set(['dup.googlesource.com']),
  446. self.c.get_duplicated_hosts())
  447. self.assertEqual(set(['partial.googlesource.com',
  448. 'gpartial-review.googlesource.com']),
  449. self.c.get_partially_configured_hosts())
  450. def test_report_no_problems(self):
  451. self.test_analysis_nothing()
  452. self.assertFalse(self.c.find_and_report_problems())
  453. self.assertEqual(sys.stdout.getvalue(), '')
  454. @mock.patch(
  455. 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
  456. return_value=os.path.join('~', '.gitcookies'))
  457. def test_report(self, *_mocks):
  458. self.test_analysis()
  459. self.assertTrue(self.c.find_and_report_problems())
  460. with open(os.path.join(os.path.dirname(__file__),
  461. 'git_cl_creds_check_report.txt')) as f:
  462. expected = f.read() % {
  463. 'sep': os.sep,
  464. }
  465. def by_line(text):
  466. return [l.rstrip() for l in text.rstrip().splitlines()]
  467. self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
  468. self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
  469. class TestGitCl(unittest.TestCase):
  470. def setUp(self):
  471. super(TestGitCl, self).setUp()
  472. self.calls = []
  473. self._calls_done = []
  474. self.failed = False
  475. mock.patch('sys.stdout', StringIO()).start()
  476. mock.patch(
  477. 'git_cl.time_time',
  478. lambda: self._mocked_call('time.time')).start()
  479. mock.patch(
  480. 'git_cl.metrics.collector.add_repeated',
  481. lambda *a: self._mocked_call('add_repeated', *a)).start()
  482. mock.patch('subprocess2.call', self._mocked_call).start()
  483. mock.patch('subprocess2.check_call', self._mocked_call).start()
  484. mock.patch('subprocess2.check_output', self._mocked_call).start()
  485. mock.patch(
  486. 'subprocess2.communicate',
  487. lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
  488. mock.patch(
  489. 'git_cl.gclient_utils.CheckCallAndFilter',
  490. self._mocked_call).start()
  491. mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
  492. mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
  493. mock.patch(
  494. 'git_cl.SaveDescriptionBackup',
  495. lambda _: self._mocked_call('SaveDescriptionBackup')).start()
  496. mock.patch(
  497. 'git_cl.write_json',
  498. lambda *a: self._mocked_call('write_json', *a)).start()
  499. mock.patch(
  500. 'git_cl.Changelist.RunHook',
  501. return_value={'more_cc': ['test-more-cc@chromium.org']}).start()
  502. mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
  503. mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
  504. mock.patch('gerrit_util.GetChangeDetail').start()
  505. mock.patch(
  506. 'git_cl.gerrit_util.GetChangeComments',
  507. lambda *a: self._mocked_call('GetChangeComments', *a)).start()
  508. mock.patch(
  509. 'git_cl.gerrit_util.GetChangeRobotComments',
  510. lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
  511. mock.patch(
  512. 'git_cl.gerrit_util.AddReviewers',
  513. lambda *a: self._mocked_call('AddReviewers', *a)).start()
  514. mock.patch(
  515. 'git_cl.gerrit_util.SetReview',
  516. lambda h, i, msg=None, labels=None, notify=None, ready=None: (
  517. self._mocked_call(
  518. 'SetReview', h, i, msg, labels, notify, ready))).start()
  519. mock.patch(
  520. 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
  521. return_value=False).start()
  522. mock.patch(
  523. 'git_cl.gerrit_util.GceAuthenticator.is_gce',
  524. return_value=False).start()
  525. mock.patch(
  526. 'git_cl.gerrit_util.ValidAccounts',
  527. lambda *a: self._mocked_call('ValidAccounts', *a)).start()
  528. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  529. mock.patch('git_cl.Settings.GetRoot', return_value='').start()
  530. self.mockGit = GitMocks()
  531. mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
  532. mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
  533. mock.patch('scm.GIT.ResolveCommit', return_value='hash').start()
  534. mock.patch('scm.GIT.IsValidRevision', return_value=True).start()
  535. mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
  536. mock.patch(
  537. 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start()
  538. mock.patch(
  539. 'scm.GIT.FetchUpstreamTuple',
  540. return_value=('origin', 'refs/heads/main')).start()
  541. mock.patch(
  542. 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
  543. # It's important to reset settings to not have inter-tests interference.
  544. git_cl.settings = None
  545. self.addCleanup(mock.patch.stopall)
  546. def tearDown(self):
  547. try:
  548. if not self.failed:
  549. self.assertEqual([], self.calls)
  550. except AssertionError:
  551. calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
  552. if len(self.calls) > 5:
  553. calls += ' ...\n'
  554. self.fail(
  555. '\n'
  556. 'There are un-consumed calls after this test has finished:\n' +
  557. calls)
  558. finally:
  559. super(TestGitCl, self).tearDown()
  560. def _mocked_call(self, *args, **_kwargs):
  561. self.assertTrue(
  562. self.calls,
  563. '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
  564. top = self.calls.pop(0)
  565. expected_args, result = top
  566. # Also logs otherwise it could get caught in a try/finally and be hard to
  567. # diagnose.
  568. if expected_args != args:
  569. N = 5
  570. prior_calls = '\n '.join(
  571. '@%d: %r' % (len(self._calls_done) - N + i, c[0])
  572. for i, c in enumerate(self._calls_done[-N:]))
  573. following_calls = '\n '.join(
  574. '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
  575. for i, c in enumerate(self.calls[:N]))
  576. extended_msg = (
  577. 'A few prior calls:\n %s\n\n'
  578. 'This (expected):\n @%d: %r\n'
  579. 'This (actual):\n @%d: %r\n\n'
  580. 'A few following expected calls:\n %s' %
  581. (prior_calls, len(self._calls_done), expected_args,
  582. len(self._calls_done), args, following_calls))
  583. self.failed = True
  584. self.fail('@%d\n'
  585. ' Expected: %r\n'
  586. ' Actual: %r\n'
  587. '\n'
  588. '%s' % (
  589. len(self._calls_done), expected_args, args, extended_msg))
  590. self._calls_done.append(top)
  591. if isinstance(result, Exception):
  592. raise result
  593. # stdout from git commands is supposed to be a bytestream. Convert it here
  594. # instead of converting all test output in this file to bytes.
  595. if args[0][0] == 'git' and not isinstance(result, bytes):
  596. result = result.encode('utf-8')
  597. return result
  598. @mock.patch('sys.stdin', StringIO('blah\nye\n'))
  599. @mock.patch('sys.stdout', StringIO())
  600. def test_ask_for_explicit_yes_true(self):
  601. self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
  602. self.assertEqual(
  603. 'prompt [Yes/No]: Please, type yes or no: ',
  604. sys.stdout.getvalue())
  605. def test_LoadCodereviewSettingsFromFile_gerrit(self):
  606. codereview_file = StringIO('GERRIT_HOST: true')
  607. self.calls = [
  608. ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
  609. ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
  610. ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
  611. ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
  612. ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
  613. ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
  614. CERR1),
  615. ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
  616. CERR1),
  617. ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
  618. CERR1),
  619. ((['git', 'config', 'gerrit.host', 'true'],), ''),
  620. ]
  621. self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
  622. @classmethod
  623. def _gerrit_base_calls(cls, issue=None, fetched_description=None,
  624. fetched_status=None, other_cl_owner=None,
  625. custom_cl_base=None, short_hostname='chromium',
  626. change_id=None, default_branch='main',
  627. reset_issue=False):
  628. calls = [
  629. (
  630. (['os.path.isfile', '.gitmodules'], ),
  631. 'True',
  632. ),
  633. ]
  634. if custom_cl_base:
  635. ancestor_revision = custom_cl_base
  636. else:
  637. # Determine ancestor_revision to be merge base.
  638. ancestor_revision = 'origin/' + default_branch
  639. if issue:
  640. # TODO: if tests don't provide a `change_id` the default used here
  641. # will cause the TRACES_README_FORMAT mock (which uses the test provided
  642. # `change_id` to fail.
  643. gerrit_util.GetChangeDetail.return_value = {
  644. 'owner': {'email': (other_cl_owner or 'owner@example.com')},
  645. 'change_id': (change_id or '123456789'),
  646. 'current_revision': 'sha1_of_current_revision',
  647. 'revisions': {'sha1_of_current_revision': {
  648. 'commit': {'message': fetched_description},
  649. }},
  650. 'status': fetched_status or 'NEW',
  651. }
  652. if fetched_status == 'ABANDONED':
  653. return calls
  654. if fetched_status == 'MERGED':
  655. calls.append(
  656. (('ask_for_data',
  657. 'Change https://chromium-review.googlesource.com/%s has been '
  658. 'submitted, new uploads are not allowed. Would you like to start '
  659. 'a new change (Y/n)?' % issue), 'y' if reset_issue else 'n')
  660. )
  661. if not reset_issue:
  662. return calls
  663. # Part of SetIssue call.
  664. calls.append(
  665. ((['git', 'log', '-1', '--format=%B'],), ''))
  666. if other_cl_owner:
  667. calls += [
  668. (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
  669. ]
  670. calls += [
  671. ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
  672. ([custom_cl_base] if custom_cl_base else
  673. [ancestor_revision, 'HEAD']),),
  674. '+dat'),
  675. ]
  676. return calls
  677. def _gerrit_upload_calls(self,
  678. description,
  679. reviewers,
  680. squash,
  681. squash_mode='default',
  682. title=None,
  683. notify=False,
  684. post_amend_description=None,
  685. issue=None,
  686. cc=None,
  687. custom_cl_base=None,
  688. short_hostname='chromium',
  689. labels=None,
  690. change_id=None,
  691. final_description=None,
  692. gitcookies_exists=True,
  693. force=False,
  694. edit_description=None,
  695. default_branch='main',
  696. ref_to_push='abcdef0123456789',
  697. external_parent=None,
  698. push_opts=None):
  699. if post_amend_description is None:
  700. post_amend_description = description
  701. cc = cc or []
  702. calls = []
  703. if squash_mode in ('override_squash', 'override_nosquash'):
  704. self.mockGit.config['gerrit.override-squash-uploads'] = (
  705. 'true' if squash_mode == 'override_squash' else 'false')
  706. if not git_footers.get_footer_change_id(description) and not squash:
  707. calls += [
  708. (('DownloadGerritHook', False), ''),
  709. ]
  710. if squash:
  711. if not issue and not force:
  712. calls += [
  713. ((['RunEditor'],), description),
  714. ]
  715. # user wants to edit description
  716. if edit_description:
  717. calls += [
  718. ((['RunEditor'],), edit_description),
  719. ]
  720. if external_parent:
  721. parent = external_parent
  722. else:
  723. if custom_cl_base is None:
  724. parent = 'origin/' + default_branch
  725. git_common.get_or_create_merge_base.return_value = parent
  726. else:
  727. calls += [
  728. (([
  729. 'git', 'merge-base', '--is-ancestor', custom_cl_base,
  730. 'refs/remotes/origin/' + default_branch
  731. ], ), callError(1)), # Means not ancenstor.
  732. (('ask_for_data',
  733. 'Do you take responsibility for cleaning up potential mess '
  734. 'resulting from proceeding with upload? Press Enter to upload, '
  735. 'or Ctrl+C to abort'), ''),
  736. ]
  737. parent = custom_cl_base
  738. calls += [
  739. ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
  740. '0123456789abcdef'),
  741. ((['FileWrite', '/tmp/fake-temp1', description],), None),
  742. ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
  743. '-F', '/tmp/fake-temp1'],),
  744. ref_to_push),
  745. ]
  746. else:
  747. ref_to_push = 'HEAD'
  748. parent = 'origin/refs/heads/' + default_branch
  749. calls += [
  750. (('SaveDescriptionBackup',), None),
  751. ((['git', 'rev-list', parent + '..' + ref_to_push],),'1hashPerLine\n'),
  752. ]
  753. metrics_arguments = []
  754. if notify:
  755. ref_suffix = '%ready,notify=ALL'
  756. metrics_arguments += ['ready', 'notify=ALL']
  757. else:
  758. if not issue and squash:
  759. ref_suffix = '%wip'
  760. metrics_arguments.append('wip')
  761. else:
  762. ref_suffix = '%notify=NONE'
  763. metrics_arguments.append('notify=NONE')
  764. # If issue is given, then description is fetched from Gerrit instead.
  765. if not title:
  766. if issue is None:
  767. if squash:
  768. title = 'Initial upload'
  769. else:
  770. calls += [
  771. ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
  772. (('ask_for_data', 'Title for patchset []: '), 'User input'),
  773. ]
  774. title = 'User input'
  775. if title:
  776. ref_suffix += ',m=' + gerrit_util.PercentEncodeForGitRef(title)
  777. metrics_arguments.append('m')
  778. for k, v in sorted((labels or {}).items()):
  779. ref_suffix += ',l=%s+%d' % (k, v)
  780. metrics_arguments.append('l=%s+%d' % (k, v))
  781. if short_hostname == 'chromium':
  782. # All reviewers and ccs get into ref_suffix.
  783. for r in sorted(reviewers):
  784. ref_suffix += ',r=%s' % r
  785. metrics_arguments.append('r')
  786. if issue is None:
  787. cc += ['test-more-cc@chromium.org', 'joe@example.com']
  788. for c in sorted(cc):
  789. ref_suffix += ',cc=%s' % c
  790. metrics_arguments.append('cc')
  791. reviewers, cc = [], []
  792. else:
  793. # TODO(crbug/877717): remove this case.
  794. calls += [
  795. (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
  796. sorted(reviewers) + ['joe@example.com',
  797. 'test-more-cc@chromium.org'] + cc),
  798. {
  799. e: {'email': e}
  800. for e in (reviewers + ['joe@example.com'] + cc)
  801. })
  802. ]
  803. for r in sorted(reviewers):
  804. if r != 'bad-account-or-email':
  805. ref_suffix += ',r=%s' % r
  806. metrics_arguments.append('r')
  807. reviewers.remove(r)
  808. if issue is None:
  809. cc += ['joe@example.com']
  810. for c in sorted(cc):
  811. ref_suffix += ',cc=%s' % c
  812. metrics_arguments.append('cc')
  813. if c in cc:
  814. cc.remove(c)
  815. calls += [
  816. (
  817. ('time.time', ),
  818. 1000,
  819. ),
  820. (
  821. ([
  822. 'git', 'push',
  823. 'https://%s.googlesource.com/my/repo' % short_hostname,
  824. ref_to_push + ':refs/for/refs/heads/' + default_branch +
  825. ref_suffix
  826. ] + (push_opts if push_opts else []), ),
  827. (('remote:\n'
  828. 'remote: Processing changes: (\)\n'
  829. 'remote: Processing changes: (|)\n'
  830. 'remote: Processing changes: (/)\n'
  831. 'remote: Processing changes: (-)\n'
  832. 'remote: Processing changes: new: 1 (/)\n'
  833. 'remote: Processing changes: new: 1, done\n'
  834. 'remote:\n'
  835. 'remote: New Changes:\n'
  836. 'remote: '
  837. 'https://%s-review.googlesource.com/#/c/my/repo/+/123456'
  838. ' XXX\n'
  839. 'remote:\n'
  840. 'To https://%s.googlesource.com/my/repo\n'
  841. ' * [new branch] hhhh -> refs/for/refs/heads/%s\n') %
  842. (short_hostname, short_hostname, default_branch)),
  843. ),
  844. (
  845. ('time.time', ),
  846. 2000,
  847. ),
  848. (
  849. ('add_repeated', 'sub_commands', {
  850. 'execution_time': 1000,
  851. 'command': 'git push',
  852. 'exit_code': 0,
  853. 'arguments': sorted(metrics_arguments),
  854. }),
  855. None,
  856. ),
  857. ]
  858. final_description = final_description or post_amend_description.strip()
  859. trace_name = os.path.join('TRACES_DIR', '20170316T200041.000000')
  860. # Trace-related calls
  861. calls += [
  862. # Write a description with context for the current trace.
  863. (
  864. ([
  865. 'FileWrite', trace_name + '-README',
  866. '%(date)s\n'
  867. '%(short_hostname)s-review.googlesource.com\n'
  868. '%(change_id)s\n'
  869. '%(title)s\n'
  870. '%(description)s\n'
  871. '1000\n'
  872. '0\n'
  873. '%(trace_name)s' % {
  874. 'date': '2017-03-16T20:00:41.000000',
  875. 'short_hostname': short_hostname,
  876. 'change_id': change_id,
  877. 'description': final_description,
  878. 'title': title or '<untitled>',
  879. 'trace_name': trace_name,
  880. }
  881. ], ),
  882. None,
  883. ),
  884. # Read traces and shorten git hashes.
  885. (
  886. (['os.path.isfile',
  887. os.path.join('TEMP_DIR', 'trace-packet')], ),
  888. True,
  889. ),
  890. (
  891. (['FileRead', os.path.join('TEMP_DIR', 'trace-packet')], ),
  892. ('git-hash: 0123456789012345678901234567890123456789\n'
  893. 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
  894. ),
  895. (
  896. ([
  897. 'FileWrite',
  898. os.path.join('TEMP_DIR', 'trace-packet'), 'git-hash: 012345\n'
  899. 'git-hash: abcdea\n'
  900. ], ),
  901. None,
  902. ),
  903. # Make zip file for the git traces.
  904. (
  905. (['make_archive', trace_name + '-traces', 'zip', 'TEMP_DIR'], ),
  906. None,
  907. ),
  908. # Collect git config and gitcookies.
  909. (
  910. (['git', 'config', '-l'], ),
  911. 'git-config-output',
  912. ),
  913. (
  914. ([
  915. 'FileWrite',
  916. os.path.join('TEMP_DIR', 'git-config'), 'git-config-output'
  917. ], ),
  918. None,
  919. ),
  920. (
  921. (['os.path.isfile',
  922. os.path.join('~', '.gitcookies')], ),
  923. gitcookies_exists,
  924. ),
  925. ]
  926. if gitcookies_exists:
  927. calls += [
  928. (
  929. (['FileRead', os.path.join('~', '.gitcookies')], ),
  930. 'gitcookies 1/SECRET',
  931. ),
  932. (
  933. ([
  934. 'FileWrite',
  935. os.path.join('TEMP_DIR', 'gitcookies'), 'gitcookies REDACTED'
  936. ], ),
  937. None,
  938. ),
  939. ]
  940. calls += [
  941. # Make zip file for the git config and gitcookies.
  942. (
  943. (['make_archive', trace_name + '-git-info', 'zip', 'TEMP_DIR'], ),
  944. None,
  945. ),
  946. ]
  947. # TODO(crbug/877717): this should never be used.
  948. if squash and short_hostname != 'chromium':
  949. calls += [
  950. (('AddReviewers',
  951. 'chromium-review.googlesource.com', 'my%2Frepo~123456',
  952. sorted(reviewers),
  953. cc + ['test-more-cc@chromium.org'],
  954. notify),
  955. ''),
  956. ]
  957. return calls
  958. def _run_gerrit_upload_test(self,
  959. upload_args,
  960. description,
  961. reviewers=None,
  962. squash=True,
  963. squash_mode=None,
  964. title=None,
  965. notify=False,
  966. post_amend_description=None,
  967. issue=None,
  968. patchset=None,
  969. cc=None,
  970. fetched_status=None,
  971. other_cl_owner=None,
  972. custom_cl_base=None,
  973. short_hostname='chromium',
  974. labels=None,
  975. change_id=None,
  976. final_description=None,
  977. gitcookies_exists=True,
  978. force=False,
  979. log_description=None,
  980. edit_description=None,
  981. fetched_description=None,
  982. default_branch='main',
  983. ref_to_push='abcdef0123456789',
  984. external_parent=None,
  985. push_opts=None,
  986. reset_issue=False):
  987. """Generic gerrit upload test framework."""
  988. if squash_mode is None:
  989. if '--no-squash' in upload_args:
  990. squash_mode = 'nosquash'
  991. elif '--squash' in upload_args:
  992. squash_mode = 'squash'
  993. else:
  994. squash_mode = 'default'
  995. reviewers = reviewers or []
  996. cc = cc or []
  997. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  998. CookiesAuthenticatorMockFactory(
  999. same_auth=('git-owner.example.com', '', 'pass'))).start()
  1000. mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck', lambda
  1001. offer_removal: None).start()
  1002. mock.patch('git_cl.Changelist.GetMostRecentPatchset', lambda _, update:
  1003. patchset).start()
  1004. mock.patch('git_cl.gclient_utils.RunEditor',
  1005. lambda *_, **__: self._mocked_call(['RunEditor'])).start()
  1006. mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
  1007. 'DownloadGerritHook', force)).start()
  1008. mock.patch('git_cl.gclient_utils.FileRead',
  1009. lambda path: self._mocked_call(['FileRead', path])).start()
  1010. mock.patch('git_cl.gclient_utils.FileWrite',
  1011. lambda path, contents: self._mocked_call(
  1012. ['FileWrite', path, contents])).start()
  1013. mock.patch('git_cl.datetime_now',
  1014. lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
  1015. mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
  1016. mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
  1017. mock.patch('git_cl.TRACES_README_FORMAT',
  1018. '%(now)s\n'
  1019. '%(gerrit_host)s\n'
  1020. '%(change_id)s\n'
  1021. '%(title)s\n'
  1022. '%(description)s\n'
  1023. '%(execution_time)s\n'
  1024. '%(exit_code)s\n'
  1025. '%(trace_name)s').start()
  1026. mock.patch('git_cl.shutil.make_archive',
  1027. lambda *args: self._mocked_call(['make_archive'] +
  1028. list(args))).start()
  1029. mock.patch('os.path.isfile',
  1030. lambda path: self._mocked_call(['os.path.isfile', path])).start()
  1031. mock.patch(
  1032. 'git_cl._create_description_from_log',
  1033. return_value=log_description or description).start()
  1034. mock.patch(
  1035. 'git_cl.Changelist._AddChangeIdToCommitMessage',
  1036. return_value=post_amend_description or description).start()
  1037. mock.patch(
  1038. 'git_cl.GenerateGerritChangeId', return_value=change_id).start()
  1039. mock.patch(
  1040. 'git_common.get_or_create_merge_base',
  1041. return_value='origin/' + default_branch).start()
  1042. mock.patch(
  1043. 'gclient_utils.AskForData',
  1044. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  1045. self.mockGit.config['gerrit.host'] = 'true'
  1046. self.mockGit.config['branch.main.gerritissue'] = (
  1047. str(issue) if issue else None)
  1048. self.mockGit.config['remote.origin.url'] = (
  1049. 'https://%s.googlesource.com/my/repo' % short_hostname)
  1050. self.mockGit.config['user.email'] = 'me@example.com'
  1051. self.calls = self._gerrit_base_calls(
  1052. issue=issue,
  1053. fetched_description=fetched_description or description,
  1054. fetched_status=fetched_status,
  1055. other_cl_owner=other_cl_owner,
  1056. custom_cl_base=custom_cl_base,
  1057. short_hostname=short_hostname,
  1058. change_id=change_id,
  1059. default_branch=default_branch,
  1060. reset_issue=reset_issue)
  1061. if fetched_status == 'ABANDONED' or (
  1062. fetched_status == 'MERGED' and not reset_issue):
  1063. pass # readability
  1064. else:
  1065. if fetched_status == 'MERGED' and reset_issue:
  1066. fetched_status = 'NEW'
  1067. issue = None
  1068. mock.patch(
  1069. 'gclient_utils.temporary_file', TemporaryFileMock()).start()
  1070. mock.patch('os.remove', return_value=True).start()
  1071. self.calls += self._gerrit_upload_calls(
  1072. description,
  1073. reviewers,
  1074. squash,
  1075. squash_mode=squash_mode,
  1076. title=title,
  1077. notify=notify,
  1078. post_amend_description=post_amend_description,
  1079. issue=issue,
  1080. cc=cc,
  1081. custom_cl_base=custom_cl_base,
  1082. short_hostname=short_hostname,
  1083. labels=labels,
  1084. change_id=change_id,
  1085. final_description=final_description,
  1086. gitcookies_exists=gitcookies_exists,
  1087. force=force,
  1088. edit_description=edit_description,
  1089. default_branch=default_branch,
  1090. ref_to_push=ref_to_push,
  1091. external_parent=external_parent,
  1092. push_opts=push_opts)
  1093. # Uncomment when debugging.
  1094. # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
  1095. git_cl.main(['upload'] + upload_args)
  1096. if squash:
  1097. self.assertIssueAndPatchset(patchset=str((patchset or 0) + 1))
  1098. self.assertEqual(
  1099. ref_to_push,
  1100. scm.GIT.GetBranchConfig('', 'main',
  1101. git_cl.GERRIT_SQUASH_HASH_CONFIG_KEY))
  1102. def test_gerrit_upload_traces_no_gitcookies(self):
  1103. self._run_gerrit_upload_test(
  1104. ['--no-squash'],
  1105. 'desc ✔\n\nBUG=\n',
  1106. [],
  1107. squash=False,
  1108. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1109. change_id='Ixxx',
  1110. gitcookies_exists=False)
  1111. def test_gerrit_upload_without_change_id(self):
  1112. self._run_gerrit_upload_test(
  1113. [],
  1114. 'desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1115. [],
  1116. change_id='Ixxx')
  1117. def test_gerrit_upload_without_change_id_nosquash(self):
  1118. self._run_gerrit_upload_test(
  1119. ['--no-squash'],
  1120. 'desc ✔\n\nBUG=\n',
  1121. [],
  1122. squash=False,
  1123. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1124. change_id='Ixxx')
  1125. def test_gerrit_upload_without_change_id_override_nosquash(self):
  1126. self._run_gerrit_upload_test(
  1127. [],
  1128. 'desc ✔\n\nBUG=\n',
  1129. [],
  1130. squash=False,
  1131. squash_mode='override_nosquash',
  1132. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1133. change_id='Ixxx')
  1134. def test_gerrit_no_reviewer(self):
  1135. self._run_gerrit_upload_test(
  1136. [],
  1137. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1138. [],
  1139. squash=False,
  1140. squash_mode='override_nosquash',
  1141. change_id='I123456789')
  1142. def test_gerrit_push_opts(self):
  1143. self._run_gerrit_upload_test(['-o', 'wip'],
  1144. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1145. [],
  1146. squash=False,
  1147. squash_mode='override_nosquash',
  1148. change_id='I123456789',
  1149. push_opts=['-o', 'wip'])
  1150. def test_gerrit_no_reviewer_non_chromium_host(self):
  1151. # TODO(crbug/877717): remove this test case.
  1152. self._run_gerrit_upload_test([],
  1153. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1154. [],
  1155. squash=False,
  1156. squash_mode='override_nosquash',
  1157. short_hostname='other',
  1158. change_id='I123456789')
  1159. def test_gerrit_patchset_title_special_chars_nosquash(self):
  1160. self._run_gerrit_upload_test(
  1161. ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
  1162. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1163. squash=False,
  1164. squash_mode='override_nosquash',
  1165. change_id='I123456789',
  1166. title='We\'ll escape ^_ ^ special chars...@{u}')
  1167. def test_gerrit_reviewers_cmd_line(self):
  1168. self._run_gerrit_upload_test(
  1169. ['-r', 'foo@example.com', '--send-mail'],
  1170. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1171. reviewers=['foo@example.com'],
  1172. squash=False,
  1173. squash_mode='override_nosquash',
  1174. notify=True,
  1175. change_id='I123456789',
  1176. final_description=(
  1177. 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
  1178. def test_gerrit_reviewers_cmd_line_send_email(self):
  1179. self._run_gerrit_upload_test(
  1180. ['-r', 'foo@example.com', '--send-email'],
  1181. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1182. reviewers=['foo@example.com'],
  1183. squash=False,
  1184. squash_mode='override_nosquash',
  1185. notify=True,
  1186. change_id='I123456789',
  1187. final_description=(
  1188. 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
  1189. def test_gerrit_upload_force_sets_bug(self):
  1190. self._run_gerrit_upload_test(
  1191. ['-b', '10000', '-f'],
  1192. u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
  1193. [],
  1194. force=True,
  1195. fetched_description='desc=\n\nChange-Id: Ixxx',
  1196. change_id='Ixxx')
  1197. def test_gerrit_upload_corrects_wrong_change_id(self):
  1198. self._run_gerrit_upload_test(
  1199. ['-b', '10000', '-m', 'Title', '--edit-description'],
  1200. u'desc=\n\nBug: 10000\nChange-Id: Ixxxx',
  1201. [],
  1202. issue='123456',
  1203. edit_description='desc=\n\nBug: 10000\nChange-Id: Izzzz',
  1204. fetched_description='desc=\n\nChange-Id: Ixxxx',
  1205. title='Title',
  1206. change_id='Ixxxx')
  1207. def test_gerrit_upload_force_sets_fixed(self):
  1208. self._run_gerrit_upload_test(
  1209. ['-x', '10000', '-f'],
  1210. u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
  1211. [],
  1212. force=True,
  1213. fetched_description='desc=\n\nChange-Id: Ixxx',
  1214. change_id='Ixxx')
  1215. def test_gerrit_reviewer_multiple(self):
  1216. self._run_gerrit_upload_test([], 'desc ✔\nBUG=\nR=another@example.com\n'
  1217. 'CC=more@example.com,people@example.com\n\n'
  1218. 'Change-Id: 123456789',
  1219. ['another@example.com'],
  1220. cc=['more@example.com', 'people@example.com'],
  1221. change_id='123456789')
  1222. def test_gerrit_upload_squash_first_is_default(self):
  1223. self._run_gerrit_upload_test(
  1224. [],
  1225. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1226. [],
  1227. change_id='123456789')
  1228. def test_gerrit_upload_squash_first(self):
  1229. self._run_gerrit_upload_test(
  1230. ['--squash'],
  1231. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1232. [],
  1233. squash=True,
  1234. change_id='123456789')
  1235. def test_gerrit_upload_squash_first_title(self):
  1236. self._run_gerrit_upload_test(
  1237. ['-f', '-t', 'title'],
  1238. 'title\n\ndesc\n\nChange-Id: 123456789',
  1239. [],
  1240. title='title',
  1241. force=True,
  1242. squash=True,
  1243. log_description='desc',
  1244. change_id='123456789')
  1245. def test_gerrit_upload_squash_first_with_labels(self):
  1246. self._run_gerrit_upload_test(
  1247. ['--squash', '--cq-dry-run', '--enable-auto-submit'],
  1248. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1249. [],
  1250. squash=True,
  1251. labels={'Commit-Queue': 1, 'Auto-Submit': 1},
  1252. change_id='123456789')
  1253. def test_gerrit_upload_squash_first_against_rev(self):
  1254. custom_cl_base = 'custom_cl_base_rev_or_branch'
  1255. self._run_gerrit_upload_test(
  1256. ['--squash', custom_cl_base],
  1257. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1258. [],
  1259. squash=True,
  1260. custom_cl_base=custom_cl_base,
  1261. change_id='123456789')
  1262. self.assertIn(
  1263. 'If you proceed with upload, more than 1 CL may be created by Gerrit',
  1264. sys.stdout.getvalue())
  1265. def test_gerrit_upload_squash_reupload(self):
  1266. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1267. self._run_gerrit_upload_test(
  1268. ['--squash'],
  1269. description,
  1270. [],
  1271. squash=True,
  1272. issue=123456,
  1273. change_id='123456789')
  1274. @mock.patch('sys.stderr', StringIO())
  1275. def test_gerrit_upload_squash_reupload_to_abandoned(self):
  1276. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1277. with self.assertRaises(SystemExitMock):
  1278. self._run_gerrit_upload_test(
  1279. ['--squash'],
  1280. description,
  1281. [],
  1282. squash=True,
  1283. issue=123456,
  1284. fetched_status='ABANDONED',
  1285. change_id='123456789')
  1286. self.assertEqual(
  1287. 'Change https://chromium-review.googlesource.com/123456 has been '
  1288. 'abandoned, new uploads are not allowed\n',
  1289. sys.stderr.getvalue())
  1290. @mock.patch(
  1291. 'gerrit_util.GetAccountDetails',
  1292. return_value={'email': 'yet-another@example.com'})
  1293. def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
  1294. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1295. self._run_gerrit_upload_test(
  1296. ['--squash'],
  1297. description,
  1298. [],
  1299. squash=True,
  1300. issue=123456,
  1301. other_cl_owner='other@example.com',
  1302. change_id='123456789')
  1303. self.assertIn(
  1304. 'WARNING: Change 123456 is owned by other@example.com, but you '
  1305. 'authenticate to Gerrit as yet-another@example.com.\n'
  1306. 'Uploading may fail due to lack of permissions',
  1307. sys.stdout.getvalue())
  1308. @mock.patch('sys.stderr', StringIO())
  1309. def test_gerrit_upload_for_merged(self):
  1310. with self.assertRaises(SystemExitMock):
  1311. self._run_gerrit_upload_test(
  1312. [],
  1313. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1314. [],
  1315. issue=123456,
  1316. fetched_status='MERGED',
  1317. change_id='I123456789',
  1318. reset_issue=False)
  1319. self.assertEqual(
  1320. 'New uploads are not allowed.\n',
  1321. sys.stderr.getvalue())
  1322. def test_gerrit_upload_new_issue_for_merged(self):
  1323. self._run_gerrit_upload_test(
  1324. [],
  1325. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1326. [],
  1327. issue=123456,
  1328. fetched_status='MERGED',
  1329. change_id='I123456789',
  1330. reset_issue=True)
  1331. def test_upload_change_description_editor(self):
  1332. fetched_description = 'foo\n\nChange-Id: 123456789'
  1333. description = 'bar\n\nChange-Id: 123456789'
  1334. self._run_gerrit_upload_test(
  1335. ['--squash', '--edit-description'],
  1336. description,
  1337. [],
  1338. fetched_description=fetched_description,
  1339. squash=True,
  1340. issue=123456,
  1341. change_id='123456789',
  1342. edit_description=description)
  1343. @mock.patch('git_cl.Changelist._UpdateWithExternalChanges',
  1344. return_value='newparent')
  1345. def test_upload_change_uses_external_base(self, *_mocks):
  1346. squash_hash = 'branch.main.' + git_cl.GERRIT_SQUASH_HASH_CONFIG_KEY
  1347. self.mockGit.config[squash_hash] = 'beef2'
  1348. self._run_gerrit_upload_test(
  1349. ['--squash'],
  1350. 'desc ✔\n\nBUG=\n\nChange-Id: 123456789',
  1351. [],
  1352. squash=True,
  1353. issue=123456,
  1354. change_id='123456789',
  1355. ref_to_push='beef2',
  1356. external_parent='newparent',
  1357. )
  1358. @mock.patch('git_cl.Changelist.GetGerritHost',
  1359. return_value='chromium-review.googlesource.com')
  1360. @mock.patch('git_cl.Changelist.GetRemoteBranch',
  1361. return_value=('origin', 'refs/remotes/origin/main'))
  1362. @mock.patch('git_cl.Changelist.PostUploadUpdates')
  1363. @mock.patch('git_cl.Changelist._RunGitPushWithTraces')
  1364. @mock.patch('git_cl._UploadAllPrecheck')
  1365. @mock.patch('git_cl.Changelist.PrepareCherryPickSquashedCommit')
  1366. def test_upload_all_squashed_cherry_pick(self, mockCherryPickCommit,
  1367. mockUploadAllPrecheck,
  1368. mockRunGitPush,
  1369. mockPostUploadUpdates, *_mocks):
  1370. # Set up
  1371. cls = [
  1372. git_cl.Changelist(branchref='refs/heads/current-branch', issue='12345'),
  1373. git_cl.Changelist(branchref='refs/heads/upstream-branch')
  1374. ]
  1375. mockUploadAllPrecheck.return_value = (cls, True)
  1376. upstream_gerrit_commit = 'upstream-commit'
  1377. self.mockGit.config[
  1378. 'branch.upstream-branch.gerritsquashhash'] = upstream_gerrit_commit
  1379. reviewers = []
  1380. ccs = []
  1381. commit_to_push = 'commit-to-push'
  1382. new_last_upload = 'new-last-upload'
  1383. change_desc = git_cl.ChangeDescription('stonks/nChange-Id:ec15e81197380')
  1384. prev_patchset = 2
  1385. new_upload = git_cl._NewUpload(reviewers, ccs, commit_to_push,
  1386. new_last_upload, upstream_gerrit_commit,
  1387. change_desc, prev_patchset)
  1388. mockCherryPickCommit.return_value = new_upload
  1389. options = optparse.Values()
  1390. options.send_mail = options.private = False
  1391. options.squash = True
  1392. options.title = None
  1393. options.message = 'honk stonk'
  1394. options.topic = 'circus'
  1395. options.enable_auto_submit = False
  1396. options.set_bot_commit = False
  1397. options.cq_dry_run = False
  1398. options.use_commit_queue = False
  1399. options.hashtags = ['cow']
  1400. options.target_branch = None
  1401. options.push_options = ['uploadvalidator~skip']
  1402. orig_args = []
  1403. mockRunGitPush.return_value = (
  1404. 'remote: https://chromium-review.'
  1405. 'googlesource.com/c/chromium/circus/clown/+/1234 stonks')
  1406. # Call
  1407. git_cl.UploadAllSquashed(options, orig_args)
  1408. # Asserts
  1409. mockCherryPickCommit.assert_called_once_with(options,
  1410. upstream_gerrit_commit)
  1411. expected_refspec = ('commit-to-push:refs/for/refs/heads/main%notify=NONE,'
  1412. 'm=honk_stonk,topic=circus,hashtag=cow')
  1413. expected_refspec_opts = [
  1414. 'notify=NONE', 'm=honk_stonk', 'topic=circus', 'hashtag=cow'
  1415. ]
  1416. mockRunGitPush.assert_called_once_with(expected_refspec,
  1417. expected_refspec_opts, mock.ANY,
  1418. options.push_options)
  1419. mockPostUploadUpdates.assert_called_once_with(options, new_upload, '1234')
  1420. @mock.patch('git_cl.Changelist.GetGerritHost',
  1421. return_value='chromium-review.googlesource.com')
  1422. @mock.patch('git_cl.Changelist.GetRemoteBranch',
  1423. return_value=('origin', 'refs/remotes/origin/main'))
  1424. @mock.patch(
  1425. 'git_cl.Changelist.GetCommonAncestorWithUpstream',
  1426. side_effect=['current-upstream-ancestor', 'next-upstream-ancestor'])
  1427. @mock.patch('git_cl.Changelist.PostUploadUpdates')
  1428. @mock.patch('git_cl.Changelist._RunGitPushWithTraces')
  1429. @mock.patch('git_cl._UploadAllPrecheck')
  1430. @mock.patch('git_cl.Changelist.PrepareSquashedCommit')
  1431. def test_upload_all_squashed(self, mockSquashedCommit, mockUploadAllPrecheck,
  1432. mockRunGitPush, mockPostUploadUpdates, *_mocks):
  1433. # Set up
  1434. cls = [
  1435. git_cl.Changelist(branchref='refs/heads/current-branch', issue='12345'),
  1436. git_cl.Changelist(branchref='refs/heads/upstream-branch')
  1437. ]
  1438. mockUploadAllPrecheck.return_value = (cls, False)
  1439. reviewers = []
  1440. ccs = []
  1441. current_commit_to_push = 'commit-to-push'
  1442. current_new_last_upload = 'new-last-upload'
  1443. change_desc = git_cl.ChangeDescription('stonks/nChange-Id:ec15e81197380')
  1444. prev_patchset = 2
  1445. new_upload_current = git_cl._NewUpload(reviewers, ccs,
  1446. current_commit_to_push,
  1447. current_new_last_upload,
  1448. 'next-upstream-ancestor',
  1449. change_desc, prev_patchset)
  1450. upstream_desc = git_cl.ChangeDescription('kwak')
  1451. upstream_parent = 'origin-commit'
  1452. upstream_new_last_upload = 'upstrea-last-upload'
  1453. upstream_commit_to_push = 'upstream_push_commit'
  1454. new_upload_upstream = git_cl._NewUpload(reviewers, ccs,
  1455. upstream_commit_to_push,
  1456. upstream_new_last_upload,
  1457. upstream_parent, upstream_desc,
  1458. prev_patchset)
  1459. mockSquashedCommit.side_effect = [new_upload_upstream, new_upload_current]
  1460. options = optparse.Values()
  1461. options.send_mail = options.private = False
  1462. options.squash = True
  1463. options.title = None
  1464. options.message = 'honk stonk'
  1465. options.topic = 'circus'
  1466. options.enable_auto_submit = False
  1467. options.set_bot_commit = False
  1468. options.cq_dry_run = False
  1469. options.use_commit_queue = False
  1470. options.hashtags = ['cow']
  1471. options.target_branch = None
  1472. options.push_options = ['uploadvalidator~skip']
  1473. orig_args = []
  1474. mockRunGitPush.return_value = (
  1475. 'remote: https://chromium-review.'
  1476. 'googlesource.com/c/chromium/circus/clown/+/1233 kwak'
  1477. '\n'
  1478. 'remote: https://chromium-review.'
  1479. 'googlesource.com/c/chromium/circus/clown/+/1234 stonks')
  1480. # Call
  1481. git_cl.UploadAllSquashed(options, orig_args)
  1482. # Asserts
  1483. self.maxDiff = None
  1484. self.assertEqual(mockSquashedCommit.mock_calls, [
  1485. mock.call(options,
  1486. 'current-upstream-ancestor',
  1487. 'current-upstream-ancestor',
  1488. end_commit='next-upstream-ancestor'),
  1489. mock.call(options,
  1490. upstream_commit_to_push,
  1491. 'next-upstream-ancestor',
  1492. end_commit=None)
  1493. ])
  1494. expected_refspec = ('commit-to-push:refs/for/refs/heads/main%notify=NONE,'
  1495. 'topic=circus,hashtag=cow')
  1496. expected_refspec_opts = ['notify=NONE', 'topic=circus', 'hashtag=cow']
  1497. mockRunGitPush.assert_called_once_with(expected_refspec,
  1498. expected_refspec_opts, mock.ANY,
  1499. options.push_options)
  1500. self.assertEqual(mockPostUploadUpdates.mock_calls, [
  1501. mock.call(options, new_upload_upstream, '1233'),
  1502. mock.call(options, new_upload_current, '1234')
  1503. ])
  1504. @mock.patch('git_cl.Changelist.GetGerritHost',
  1505. return_value='chromium-review.googlesource.com')
  1506. @mock.patch('git_cl.Changelist.GetRemoteBranch',
  1507. return_value=('origin', 'refs/remotes/origin/main'))
  1508. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream',
  1509. return_value='current-upstream-ancestor')
  1510. @mock.patch('git_cl.Changelist._UpdateWithExternalChanges')
  1511. @mock.patch('git_cl.Changelist.PostUploadUpdates')
  1512. @mock.patch('git_cl.Changelist._RunGitPushWithTraces')
  1513. @mock.patch('git_cl._UploadAllPrecheck')
  1514. @mock.patch('git_cl.Changelist.PrepareSquashedCommit')
  1515. def test_upload_all_squashed_external_changes(self, mockSquashedCommit,
  1516. mockUploadAllPrecheck,
  1517. mockRunGitPush,
  1518. mockPostUploadUpdates,
  1519. mockExternalChanges, *_mocks):
  1520. options = optparse.Values()
  1521. options.send_mail = options.private = False
  1522. options.squash = True
  1523. options.title = None
  1524. options.topic = 'circus'
  1525. options.message = 'honk stonk'
  1526. options.enable_auto_submit = False
  1527. options.set_bot_commit = False
  1528. options.cq_dry_run = False
  1529. options.use_commit_queue = False
  1530. options.hashtags = ['cow']
  1531. options.target_branch = None
  1532. options.push_options = ['uploadvalidator~skip']
  1533. orig_args = []
  1534. cls = [
  1535. git_cl.Changelist(branchref='refs/heads/current-branch', issue='12345')
  1536. ]
  1537. mockUploadAllPrecheck.return_value = (cls, False)
  1538. reviewers = []
  1539. ccs = []
  1540. # Test case: user wants to pull in external changes.
  1541. mockExternalChanges.reset_mock()
  1542. mockExternalChanges.return_value = None
  1543. current_commit_to_push = 'commit-to-push'
  1544. current_new_last_upload = 'new-last-upload'
  1545. change_desc = git_cl.ChangeDescription('stonks/nChange-Id:ec15e81197380')
  1546. prev_patchset = 2
  1547. new_upload_current = git_cl._NewUpload(reviewers, ccs,
  1548. current_commit_to_push,
  1549. current_new_last_upload,
  1550. 'next-upstream-ancestor',
  1551. change_desc, prev_patchset)
  1552. mockSquashedCommit.return_value = new_upload_current
  1553. mockRunGitPush.return_value = (
  1554. 'remote: https://chromium-review.'
  1555. 'googlesource.com/c/chromium/circus/clown/+/1233 kwak')
  1556. # Test case: user wants to pull in external changes.
  1557. mockExternalChanges.reset_mock()
  1558. mockExternalChanges.return_value = 'external-commit'
  1559. # Call
  1560. git_cl.UploadAllSquashed(options, orig_args)
  1561. # Asserts
  1562. self.assertEqual(mockSquashedCommit.mock_calls, [
  1563. mock.call(
  1564. options, 'external-commit', 'external-commit', end_commit=None)
  1565. ])
  1566. expected_refspec = ('commit-to-push:refs/for/refs/heads/main%notify=NONE,'
  1567. 'm=honk_stonk,topic=circus,hashtag=cow')
  1568. expected_refspec_opts = [
  1569. 'notify=NONE', 'm=honk_stonk', 'topic=circus', 'hashtag=cow'
  1570. ]
  1571. mockRunGitPush.assert_called_once_with(expected_refspec,
  1572. expected_refspec_opts, mock.ANY,
  1573. options.push_options)
  1574. self.assertEqual(mockPostUploadUpdates.mock_calls,
  1575. [mock.call(options, new_upload_current, '1233')])
  1576. # Test case: user does not want external changes or there are none.
  1577. mockSquashedCommit.reset_mock()
  1578. mockExternalChanges.return_value = None
  1579. # Call
  1580. git_cl.UploadAllSquashed(options, orig_args)
  1581. # Asserts
  1582. self.assertEqual(mockSquashedCommit.mock_calls, [
  1583. mock.call(options,
  1584. 'current-upstream-ancestor',
  1585. 'current-upstream-ancestor',
  1586. end_commit=None)
  1587. ])
  1588. @mock.patch(
  1589. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1590. @mock.patch('git_cl.RunGit')
  1591. @mock.patch('git_cl.RunGitSilent')
  1592. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1593. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1594. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1595. @mock.patch('scm.GIT.GetBranchRef')
  1596. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1597. @mock.patch('scm.GIT.IsAncestor')
  1598. @mock.patch('gclient_utils.AskForData')
  1599. def test_upload_all_precheck_long_chain(
  1600. self, mockAskForData, mockIsAncestor, mockGetRemoteBranch,
  1601. mockGetBranchRef, mockGetCommonAncestorWithUpstream,
  1602. mockFetchUpstreamTuple, mockGitGetBranchConfigValue, mockRunGitSilent,
  1603. mockRunGit, *_mocks):
  1604. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1605. branches = [
  1606. 'current', 'upstream3', 'blank3', 'blank2', 'upstream2', 'blank1',
  1607. 'upstream1', 'origin/main'
  1608. ]
  1609. mockGetBranchRef.side_effect = (
  1610. ['refs/heads/current'] + # detached HEAD check
  1611. ['refs/heads/%s' % b for b in branches])
  1612. mockGetCommonAncestorWithUpstream.side_effect = [
  1613. 'commit3.5',
  1614. 'commit3.5',
  1615. 'commit3.5',
  1616. 'commit2.5',
  1617. 'commit1.5',
  1618. 'commit1.5',
  1619. 'commit0.5',
  1620. ]
  1621. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1622. ('.', 'refs/heads/blank3'),
  1623. ('.', 'refs/heads/blank2'),
  1624. ('.', 'refs/heads/upstream2'),
  1625. ('.', 'refs/heads/blank1'),
  1626. ('.', 'refs/heads/upstream1'),
  1627. ('origin', 'refs/heads/origin/main')]
  1628. # end commits
  1629. mockRunGit.side_effect = [
  1630. 'commit4', 'commit3.5', 'commit3.5', 'commit2', 'commit1.5', 'commit1',
  1631. 'commit0.5'
  1632. ]
  1633. mockRunGitSilent.side_effect = [
  1634. 'diff', 'diff', None, None, 'diff', None, 'diff'
  1635. ]
  1636. # Get gerrit squash hash. We only check this for branches that have a diff.
  1637. # Set to None to trigger `must_upload_upstream`.
  1638. mockGitGetBranchConfigValue.return_value = None
  1639. options = optparse.Values()
  1640. options.force = False
  1641. options.cherry_pick_stacked = False
  1642. orig_args = ['--preserve-tryjobs', '--chicken']
  1643. # Case 2: upstream3 has never been uploaded.
  1644. # (so no LAST_UPLOAD_HASH_CONIFG_KEY)
  1645. # Case 4: upstream2's last_upload is behind upstream3's base_commit
  1646. self.mockGit.config['branch.upstream2.%s' %
  1647. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit2.3'
  1648. mockIsAncestor.side_effect = [True]
  1649. # Case 3: upstream1's last_upload matches upstream2's base_commit
  1650. self.mockGit.config['branch.upstream1.%s' %
  1651. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit1.5'
  1652. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1653. self.assertFalse(cherry_pick)
  1654. mockAskForData.assert_called_once_with(
  1655. "\noptions ['--preserve-tryjobs', '--chicken'] will be used for all "
  1656. "uploads.\nAt least one parent branch in `current, upstream3, "
  1657. "upstream2` has never been uploaded and must be uploaded before/with "
  1658. "`upstream3`.\nPress Enter to confirm, or Ctrl+C to abort")
  1659. self.assertEqual(len(cls), 3)
  1660. @mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
  1661. lambda offer_removal: None)
  1662. @mock.patch('git_cl.RunGit')
  1663. @mock.patch('git_cl.RunGitSilent')
  1664. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1665. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1666. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1667. @mock.patch('scm.GIT.GetBranchRef')
  1668. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1669. @mock.patch('scm.GIT.IsAncestor')
  1670. @mock.patch('gclient_utils.AskForData')
  1671. def test_upload_all_precheck_options_must_upload(
  1672. self, mockAskForData, mockIsAncestor, mockGetRemoteBranch,
  1673. mockGetBranchRef, mockGetCommonAncestorWithUpstream,
  1674. mockFetchUpstreamTuple, mockGitGetBranchConfigValue, mockRunGitSilent,
  1675. mockRunGit, *_mocks):
  1676. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1677. branches = ['current', 'upstream3', 'main']
  1678. mockGetBranchRef.side_effect = (
  1679. ['refs/heads/current'] + # detached HEAD check
  1680. ['refs/heads/%s' % b for b in branches])
  1681. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1682. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1683. ('origin', 'refs/heads/main')]
  1684. mockIsAncestor.return_value = True
  1685. # end commits
  1686. mockRunGit.return_value = 'any-commit'
  1687. mockRunGitSilent.return_value = 'diff'
  1688. # Get gerrit squash hash. We only check this for branches that have a diff.
  1689. mockGitGetBranchConfigValue.return_value = None
  1690. # Test case: User wants to cherry pick, but all branches must be uploaded.
  1691. options = optparse.Values()
  1692. options.force = True
  1693. options.cherry_pick_stacked = True
  1694. orig_args = []
  1695. with self.assertRaises(SystemExitMock):
  1696. git_cl._UploadAllPrecheck(options, orig_args)
  1697. # Test case: User does not require cherry picking
  1698. options.cherry_pick_stacked = False
  1699. # reset side_effects
  1700. mockGetBranchRef.side_effect = (
  1701. ['refs/heads/current'] + # detached HEAD check
  1702. ['refs/heads/%s' % b for b in branches])
  1703. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1704. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1705. ('origin', 'refs/heads/main')]
  1706. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1707. self.assertFalse(cherry_pick)
  1708. self.assertEqual(len(cls), 2)
  1709. mockAskForData.assert_not_called()
  1710. # Test case: User does not require cherry picking and not in force mode.
  1711. options.force = False
  1712. # reset side_effects
  1713. mockGetBranchRef.side_effect = (
  1714. ['refs/heads/current'] + # detached HEAD check
  1715. ['refs/heads/%s' % b for b in branches])
  1716. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1717. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1718. ('origin', 'refs/heads/main')]
  1719. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1720. self.assertFalse(cherry_pick)
  1721. self.assertEqual(len(cls), 2)
  1722. mockAskForData.assert_called_once()
  1723. @mock.patch(
  1724. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1725. @mock.patch('git_cl.RunGit')
  1726. @mock.patch('git_cl.RunGitSilent')
  1727. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1728. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1729. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1730. @mock.patch('scm.GIT.GetBranchRef')
  1731. @mock.patch('scm.GIT.IsAncestor')
  1732. @mock.patch('gclient_utils.AskForData')
  1733. def test_upload_all_precheck_must_rebase(
  1734. self, mockAskForData, mockIsAncestor, mockGetBranchRef,
  1735. mockGetCommonAncestorWithUpstream, mockFetchUpstreamTuple,
  1736. mockGitGetBranchConfigValue, mockRunGitSilent, mockRunGit, *_mocks):
  1737. branches = ['current', 'upstream3']
  1738. mockGetBranchRef.side_effect = ['refs/heads/%s' % b for b in branches]
  1739. mockGetCommonAncestorWithUpstream.return_value = 'commit3.5'
  1740. mockFetchUpstreamTuple.return_value = ('.', 'refs/heads/upstream3')
  1741. # end commits
  1742. mockRunGit.return_value = 'commit4'
  1743. mockRunGitSilent.return_value = 'diff'
  1744. # Get gerrit squash hash. We only check this for branches that have a diff.
  1745. # Set to None to trigger `must_upload_upstream`.
  1746. mockGitGetBranchConfigValue.return_value = None
  1747. # Case 5: current's base_commit is behind upstream3's last_upload.
  1748. self.mockGit.config['branch.upstream3.%s' %
  1749. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit3.7'
  1750. mockIsAncestor.side_effect = [False, True]
  1751. with self.assertRaises(SystemExitMock):
  1752. options = optparse.Values()
  1753. options.force = False
  1754. options.cherry_pick_stacked = False
  1755. git_cl._UploadAllPrecheck(options, [])
  1756. @mock.patch(
  1757. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1758. @mock.patch('git_cl.RunGit')
  1759. @mock.patch('git_cl.RunGitSilent')
  1760. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1761. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1762. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1763. @mock.patch('scm.GIT.GetBranchRef')
  1764. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1765. @mock.patch('scm.GIT.IsAncestor')
  1766. @mock.patch('gclient_utils.AskForData')
  1767. def test_upload_all_precheck_hit_main(self, mockAskForData, mockIsAncestor,
  1768. mockGetRemoteBranch, mockGetBranchRef,
  1769. mockGetCommonAncestorWithUpstream,
  1770. mockFetchUpstreamTuple,
  1771. mockGitGetBranchConfigValue,
  1772. mockRunGitSilent, mockRunGit, *_mocks):
  1773. options = optparse.Values()
  1774. options.force = False
  1775. options.cherry_pick_stacked = False
  1776. orig_args = ['--preserve-tryjobs', '--chicken']
  1777. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1778. branches = ['current', 'upstream3', 'main']
  1779. mockGetBranchRef.side_effect = (
  1780. ['refs/heads/current'] + # detached HEAD check
  1781. ['refs/heads/%s' % b for b in branches])
  1782. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1783. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1784. ('origin', 'refs/heads/main')]
  1785. mockIsAncestor.return_value = True
  1786. # Give upstream3 a last upload hash
  1787. self.mockGit.config['branch.upstream3.%s' %
  1788. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit3.4'
  1789. # end commits
  1790. mockRunGit.return_value = 'commit4'
  1791. mockRunGitSilent.return_value = 'diff'
  1792. # Get gerrit squash hash. We only check this for branches that have a diff.
  1793. mockGitGetBranchConfigValue.return_value = 'just needs to exist'
  1794. # Test case: user cherry picks with options
  1795. options.cherry_pick_stacked = True
  1796. # Reset side_effects
  1797. mockGetBranchRef.side_effect = (
  1798. ['refs/heads/current'] + # detached HEAD check
  1799. ['refs/heads/%s' % b for b in branches])
  1800. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1801. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1802. ('origin', 'refs/heads/main')]
  1803. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1804. self.assertTrue(cherry_pick)
  1805. self.assertEqual(len(cls), 2)
  1806. mockAskForData.assert_not_called()
  1807. # Test case: user uses force, no cherry-pick.
  1808. options.cherry_pick_stacked = False
  1809. options.force = True
  1810. # Reset side_effects
  1811. mockGetBranchRef.side_effect = (
  1812. ['refs/heads/current'] + # detached HEAD check
  1813. ['refs/heads/%s' % b for b in branches])
  1814. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1815. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1816. ('origin', 'refs/heads/main')]
  1817. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1818. self.assertFalse(cherry_pick)
  1819. self.assertEqual(len(cls), 2)
  1820. mockAskForData.assert_not_called()
  1821. # Test case: user wants to cherry pick after being asked.
  1822. mockAskForData.return_value = 'n'
  1823. options.cherry_pick_stacked = False
  1824. options.force = False
  1825. # Reset side_effects
  1826. mockGetBranchRef.side_effect = (
  1827. ['refs/heads/current'] + # detached HEAD check
  1828. ['refs/heads/%s' % b for b in branches])
  1829. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1830. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1831. ('origin', 'refs/heads/main')]
  1832. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1833. self.assertTrue(cherry_pick)
  1834. self.assertEqual(len(cls), 2)
  1835. mockAskForData.assert_called_once_with(
  1836. "\noptions ['--preserve-tryjobs', '--chicken'] will be used for all "
  1837. "uploads.\n"
  1838. "Press enter to update branches current, upstream3.\n"
  1839. "Or type `n` to upload only `current` cherry-picked on upstream3's "
  1840. "last upload:")
  1841. @mock.patch(
  1842. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1843. @mock.patch('git_cl.RunGit')
  1844. @mock.patch('git_cl.RunGitSilent')
  1845. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1846. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1847. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1848. @mock.patch('scm.GIT.GetBranchRef')
  1849. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1850. @mock.patch('scm.GIT.IsAncestor')
  1851. @mock.patch('gclient_utils.AskForData')
  1852. def test_upload_all_precheck_one_change(
  1853. self, mockAskForData, mockIsAncestor, mockGetRemoteBranch,
  1854. mockGetBranchRef, mockGetCommonAncestorWithUpstream,
  1855. mockFetchUpstreamTuple, mockGitGetBranchConfigValue, mockRunGitSilent,
  1856. mockRunGit, *_mocks):
  1857. options = optparse.Values()
  1858. options.force = False
  1859. options.cherry_pick_stacked = False
  1860. orig_args = ['--preserve-tryjobs', '--chicken']
  1861. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1862. mockGetBranchRef.side_effect = [
  1863. 'refs/heads/current', # detached HEAD check
  1864. 'refs/heads/current', # call within while loop
  1865. 'refs/heads/main',
  1866. 'refs/heads/main'
  1867. ]
  1868. mockGetCommonAncestorWithUpstream.return_value = 'commit3.5'
  1869. mockFetchUpstreamTuple.return_value = ('', 'refs/heads/main')
  1870. mockIsAncestor.return_value = True
  1871. # end commits
  1872. mockRunGit.return_value = 'commit4'
  1873. mockRunGitSilent.return_value = 'diff'
  1874. # Get gerrit squash hash. We only check this for branches that have a diff.
  1875. # Set to None to trigger `must_upload_upstream`.
  1876. mockGitGetBranchConfigValue.return_value = 'does not matter'
  1877. # Case 1: We hit the main branch
  1878. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1879. self.assertFalse(cherry_pick)
  1880. self.assertEqual(len(cls), 1)
  1881. mockAskForData.assert_not_called()
  1882. # No diff for current change
  1883. mockRunGitSilent.return_value = ''
  1884. with self.assertRaises(SystemExitMock):
  1885. git_cl._UploadAllPrecheck(options, orig_args)
  1886. @mock.patch('scm.GIT.GetBranchRef', return_value=None)
  1887. def test_upload_all_precheck_detached_HEAD(self, mockGetBranchRef):
  1888. with self.assertRaises(SystemExitMock):
  1889. git_cl._UploadAllPrecheck(optparse.Values(), [])
  1890. @mock.patch('git_cl.RunGit')
  1891. @mock.patch('git_cl.CMDupload')
  1892. @mock.patch('sys.stdin', StringIO('\n'))
  1893. @mock.patch('sys.stdout', StringIO())
  1894. def test_upload_branch_deps(self, *_mocks):
  1895. def mock_run_git(*args, **_kwargs):
  1896. if args[0] == ['for-each-ref',
  1897. '--format=%(refname:short) %(upstream:short)',
  1898. 'refs/heads']:
  1899. # Create a local branch dependency tree that looks like this:
  1900. # test1 -> test2 -> test3 -> test4 -> test5
  1901. # -> test3.1
  1902. # test6 -> test0
  1903. branch_deps = [
  1904. 'test2 test1', # test1 -> test2
  1905. 'test3 test2', # test2 -> test3
  1906. 'test3.1 test2', # test2 -> test3.1
  1907. 'test4 test3', # test3 -> test4
  1908. 'test5 test4', # test4 -> test5
  1909. 'test6 test0', # test0 -> test6
  1910. 'test7', # test7
  1911. ]
  1912. return '\n'.join(branch_deps)
  1913. git_cl.RunGit.side_effect = mock_run_git
  1914. git_cl.CMDupload.return_value = 0
  1915. class MockChangelist():
  1916. def __init__(self):
  1917. pass
  1918. def GetBranch(self):
  1919. return 'test1'
  1920. def GetIssue(self):
  1921. return '123'
  1922. def GetPatchset(self):
  1923. return '1001'
  1924. def IsGerrit(self):
  1925. return False
  1926. ret = git_cl.upload_branch_deps(MockChangelist(), [])
  1927. # CMDupload should have been called 5 times because of 5 dependent branches.
  1928. self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
  1929. self.assertEqual(0, ret)
  1930. def test_gerrit_change_id(self):
  1931. self.calls = [
  1932. ((['git', 'write-tree'], ),
  1933. 'hashtree'),
  1934. ((['git', 'rev-parse', 'HEAD~0'], ),
  1935. 'branch-parent'),
  1936. ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
  1937. 'A B <a@b.org> 1456848326 +0100'),
  1938. ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
  1939. 'C D <c@d.org> 1456858326 +0100'),
  1940. ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
  1941. 'hashchange'),
  1942. ]
  1943. change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
  1944. self.assertEqual(change_id, 'Ihashchange')
  1945. @mock.patch('gerrit_util.IsCodeOwnersEnabledOnHost')
  1946. @mock.patch('git_cl.Settings.GetBugPrefix')
  1947. @mock.patch('git_cl.Changelist.FetchDescription')
  1948. @mock.patch('git_cl.Changelist.GetBranch')
  1949. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1950. @mock.patch('git_cl.Changelist.GetGerritHost')
  1951. @mock.patch('git_cl.Changelist.GetGerritProject')
  1952. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1953. @mock.patch('owners_client.OwnersClient.BatchListOwners')
  1954. def getDescriptionForUploadTest(self,
  1955. mockBatchListOwners=None,
  1956. mockGetRemoteBranch=None,
  1957. mockGetGerritProject=None,
  1958. mockGetGerritHost=None,
  1959. mockGetCommonAncestorWithUpstream=None,
  1960. mockGetBranch=None,
  1961. mockFetchDescription=None,
  1962. mockGetBugPrefix=None,
  1963. mockIsCodeOwnersEnabledOnHost=None,
  1964. initial_description='desc',
  1965. bug=None,
  1966. fixed=None,
  1967. branch='branch',
  1968. reviewers=None,
  1969. add_owners_to=None,
  1970. expected_description='desc'):
  1971. reviewers = reviewers or []
  1972. owners_by_path = {
  1973. 'a': ['a@example.com'],
  1974. 'b': ['b@example.com'],
  1975. 'c': ['c@example.com'],
  1976. }
  1977. mockIsCodeOwnersEnabledOnHost.return_value = True
  1978. mockGetBranch.return_value = branch
  1979. mockGetBugPrefix.return_value = 'prefix'
  1980. mockGetCommonAncestorWithUpstream.return_value = 'upstream'
  1981. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1982. mockFetchDescription.return_value = 'desc'
  1983. mockBatchListOwners.side_effect = lambda ps: {
  1984. p: owners_by_path.get(p)
  1985. for p in ps
  1986. }
  1987. cl = git_cl.Changelist(issue=1234)
  1988. actual = cl._GetDescriptionForUpload(options=mock.Mock(
  1989. bug=bug,
  1990. fixed=fixed,
  1991. reviewers=reviewers,
  1992. add_owners_to=add_owners_to,
  1993. message=initial_description),
  1994. git_diff_args=None,
  1995. files=list(owners_by_path))
  1996. self.assertEqual(expected_description, actual.description)
  1997. def testGetDescriptionForUpload(self):
  1998. self.getDescriptionForUploadTest()
  1999. def testGetDescriptionForUpload_Bug(self):
  2000. self.getDescriptionForUploadTest(
  2001. bug='1234',
  2002. expected_description='\n'.join([
  2003. 'desc',
  2004. '',
  2005. 'Bug: prefix:1234',
  2006. ]))
  2007. def testGetDescriptionForUpload_Fixed(self):
  2008. self.getDescriptionForUploadTest(
  2009. fixed='1234',
  2010. expected_description='\n'.join([
  2011. 'desc',
  2012. '',
  2013. 'Fixed: prefix:1234',
  2014. ]))
  2015. @mock.patch('git_cl.Changelist.GetIssue')
  2016. def testGetDescriptionForUpload_BugFromBranch(self, mockGetIssue):
  2017. mockGetIssue.return_value = None
  2018. self.getDescriptionForUploadTest(
  2019. branch='bug-1234',
  2020. expected_description='\n'.join([
  2021. 'desc',
  2022. '',
  2023. 'Bug: prefix:1234',
  2024. ]))
  2025. @mock.patch('git_cl.Changelist.GetIssue')
  2026. def testGetDescriptionForUpload_FixedFromBranch(self, mockGetIssue):
  2027. mockGetIssue.return_value = None
  2028. self.getDescriptionForUploadTest(
  2029. branch='fix-1234',
  2030. expected_description='\n'.join([
  2031. 'desc',
  2032. '',
  2033. 'Fixed: prefix:1234',
  2034. ]))
  2035. def testGetDescriptionForUpload_SkipBugFromBranchIfAlreadyUploaded(self):
  2036. self.getDescriptionForUploadTest(
  2037. branch='bug-1234',
  2038. expected_description='desc',
  2039. )
  2040. def testGetDescriptionForUpload_AddOwnersToR(self):
  2041. self.getDescriptionForUploadTest(
  2042. reviewers=['a@example.com'],
  2043. add_owners_to='R',
  2044. expected_description='\n'.join([
  2045. 'desc',
  2046. '',
  2047. 'R=a@example.com, b@example.com, c@example.com',
  2048. ]))
  2049. def testGetDescriptionForUpload_AddOwnersToNoOwnersNeeded(self):
  2050. self.getDescriptionForUploadTest(
  2051. reviewers=['a@example.com', 'c@example.com'],
  2052. expected_description='\n'.join([
  2053. 'desc',
  2054. '',
  2055. 'R=a@example.com, c@example.com',
  2056. ]))
  2057. def testGetDescriptionForUpload_Reviewers(self):
  2058. self.getDescriptionForUploadTest(
  2059. reviewers=['a@example.com', 'b@example.com'],
  2060. expected_description='\n'.join([
  2061. 'desc',
  2062. '',
  2063. 'R=a@example.com, b@example.com',
  2064. ]))
  2065. def test_description_append_footer(self):
  2066. for init_desc, footer_line, expected_desc in [
  2067. # Use unique desc first lines for easy test failure identification.
  2068. ('foo', 'R=one', 'foo\n\nR=one'),
  2069. ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
  2070. ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  2071. ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  2072. ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
  2073. 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
  2074. ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
  2075. 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
  2076. ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
  2077. ]:
  2078. desc = git_cl.ChangeDescription(init_desc)
  2079. desc.append_footer(footer_line)
  2080. self.assertEqual(desc.description, expected_desc)
  2081. def test_update_reviewers(self):
  2082. data = [
  2083. ('foo', [], 'foo'),
  2084. ('foo\nR=xx', [], 'foo\nR=xx'),
  2085. ('foo', ['a@c'], 'foo\n\nR=a@c'),
  2086. ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
  2087. ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
  2088. ('foo\nR=xx\nR=bar', ['a@c'], 'foo\n\nR=a@c, bar, xx'),
  2089. ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
  2090. ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
  2091. ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
  2092. # Same as the line before, but full of whitespaces.
  2093. (
  2094. 'foo\nBar\n\n R = \n BUG = \n R = ',
  2095. ['c@c'],
  2096. 'foo\nBar\n\nR=c@c\n BUG =',
  2097. ),
  2098. # Whitespaces aren't interpreted as new lines.
  2099. ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
  2100. ]
  2101. expected = [i[-1] for i in data]
  2102. actual = []
  2103. for orig, reviewers, _expected in data:
  2104. obj = git_cl.ChangeDescription(orig)
  2105. obj.update_reviewers(reviewers)
  2106. actual.append(obj.description)
  2107. self.assertEqual(expected, actual)
  2108. def test_get_hash_tags(self):
  2109. cases = [
  2110. ('', []),
  2111. ('a', []),
  2112. ('[a]', ['a']),
  2113. ('[aa]', ['aa']),
  2114. ('[a ]', ['a']),
  2115. ('[a- ]', ['a']),
  2116. ('[a- b]', ['a-b']),
  2117. ('[a--b]', ['a-b']),
  2118. ('[a', []),
  2119. ('[a]x', ['a']),
  2120. ('[aa]x', ['aa']),
  2121. ('[a b]', ['a-b']),
  2122. ('[a b]', ['a-b']),
  2123. ('[a__b]', ['a-b']),
  2124. ('[a] x', ['a']),
  2125. ('[a][b]', ['a', 'b']),
  2126. ('[a] [b]', ['a', 'b']),
  2127. ('[a][b]x', ['a', 'b']),
  2128. ('[a][b] x', ['a', 'b']),
  2129. ('[a]\n[b]', ['a']),
  2130. ('[a\nb]', []),
  2131. ('[a][', ['a']),
  2132. ('Revert "[a] feature"', ['a']),
  2133. ('Reland "[a] feature"', ['a']),
  2134. ('Revert: [a] feature', ['a']),
  2135. ('Reland: [a] feature', ['a']),
  2136. ('Revert "Reland: [a] feature"', ['a']),
  2137. ('Foo: feature', ['foo']),
  2138. ('Foo Bar: feature', ['foo-bar']),
  2139. ('Change Foo::Bar', []),
  2140. ('Foo: Change Foo::Bar', ['foo']),
  2141. ('Revert "Foo bar: feature"', ['foo-bar']),
  2142. ('Reland "Foo bar: feature"', ['foo-bar']),
  2143. ]
  2144. for desc, expected in cases:
  2145. change_desc = git_cl.ChangeDescription(desc)
  2146. actual = change_desc.get_hash_tags()
  2147. self.assertEqual(
  2148. actual,
  2149. expected,
  2150. 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
  2151. self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'main'))
  2152. self.assertEqual(None, git_cl.GetTargetRef(None,
  2153. 'refs/remotes/origin/main',
  2154. 'main'))
  2155. # Check default target refs for branches.
  2156. self.assertEqual('refs/heads/main',
  2157. git_cl.GetTargetRef('origin', 'refs/remotes/origin/main',
  2158. None))
  2159. self.assertEqual('refs/heads/main',
  2160. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
  2161. None))
  2162. self.assertEqual('refs/heads/main',
  2163. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
  2164. None))
  2165. self.assertEqual('refs/branch-heads/123',
  2166. git_cl.GetTargetRef('origin',
  2167. 'refs/remotes/branch-heads/123',
  2168. None))
  2169. self.assertEqual('refs/diff/test',
  2170. git_cl.GetTargetRef('origin',
  2171. 'refs/remotes/origin/refs/diff/test',
  2172. None))
  2173. self.assertEqual('refs/heads/chrome/m42',
  2174. git_cl.GetTargetRef('origin',
  2175. 'refs/remotes/origin/chrome/m42',
  2176. None))
  2177. # Check target refs for user-specified target branch.
  2178. for branch in ('branch-heads/123', 'remotes/branch-heads/123',
  2179. 'refs/remotes/branch-heads/123'):
  2180. self.assertEqual('refs/branch-heads/123',
  2181. git_cl.GetTargetRef('origin',
  2182. 'refs/remotes/origin/main',
  2183. branch))
  2184. for branch in ('origin/main', 'remotes/origin/main',
  2185. 'refs/remotes/origin/main'):
  2186. self.assertEqual('refs/heads/main',
  2187. git_cl.GetTargetRef('origin',
  2188. 'refs/remotes/branch-heads/123',
  2189. branch))
  2190. for branch in ('main', 'heads/main', 'refs/heads/main'):
  2191. self.assertEqual('refs/heads/main',
  2192. git_cl.GetTargetRef('origin',
  2193. 'refs/remotes/branch-heads/123',
  2194. branch))
  2195. @mock.patch('git_common.is_dirty_git_tree', return_value=True)
  2196. def test_patch_when_dirty(self, *_mocks):
  2197. # Patch when local tree is dirty.
  2198. self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
  2199. def assertIssueAndPatchset(
  2200. self, branch='main', issue='123456', patchset='7',
  2201. git_short_host='chromium'):
  2202. self.assertEqual(
  2203. issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
  2204. self.assertEqual(
  2205. patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
  2206. self.assertEqual(
  2207. 'https://%s-review.googlesource.com' % git_short_host,
  2208. scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
  2209. def _patch_common(self, git_short_host='chromium'):
  2210. mock.patch('scm.GIT.ResolveCommit', return_value='deadbeef').start()
  2211. self.mockGit.config['remote.origin.url'] = (
  2212. 'https://%s.googlesource.com/my/repo' % git_short_host)
  2213. gerrit_util.GetChangeDetail.return_value = {
  2214. 'current_revision': '7777777777',
  2215. 'revisions': {
  2216. '1111111111': {
  2217. '_number': 1,
  2218. 'fetch': {'http': {
  2219. 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
  2220. 'ref': 'refs/changes/56/123456/1',
  2221. }},
  2222. },
  2223. '7777777777': {
  2224. '_number': 7,
  2225. 'fetch': {'http': {
  2226. 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
  2227. 'ref': 'refs/changes/56/123456/7',
  2228. }},
  2229. },
  2230. },
  2231. }
  2232. def test_patch_gerrit_default(self):
  2233. self._patch_common()
  2234. self.calls += [
  2235. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  2236. 'refs/changes/56/123456/7'],), ''),
  2237. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2238. ]
  2239. self.assertEqual(git_cl.main(['patch', '123456']), 0)
  2240. self.assertIssueAndPatchset()
  2241. def test_patch_gerrit_new_branch(self):
  2242. self._patch_common()
  2243. self.calls += [
  2244. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  2245. 'refs/changes/56/123456/7'],), ''),
  2246. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2247. ]
  2248. self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
  2249. self.assertIssueAndPatchset(branch='feature')
  2250. def test_patch_gerrit_force(self):
  2251. self._patch_common('host')
  2252. self.calls += [
  2253. ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
  2254. 'refs/changes/56/123456/7'],), ''),
  2255. ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
  2256. ]
  2257. self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
  2258. self.assertIssueAndPatchset(git_short_host='host')
  2259. def test_patch_gerrit_guess_by_url(self):
  2260. self._patch_common('else')
  2261. self.calls += [
  2262. ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
  2263. 'refs/changes/56/123456/1'],), ''),
  2264. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2265. ]
  2266. self.assertEqual(git_cl.main(
  2267. ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
  2268. self.assertIssueAndPatchset(patchset='1', git_short_host='else')
  2269. def test_patch_gerrit_guess_by_url_with_repo(self):
  2270. self._patch_common('else')
  2271. self.calls += [
  2272. ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
  2273. 'refs/changes/56/123456/1'],), ''),
  2274. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2275. ]
  2276. self.assertEqual(git_cl.main(
  2277. ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
  2278. 0)
  2279. self.assertIssueAndPatchset(patchset='1', git_short_host='else')
  2280. @mock.patch('sys.stderr', StringIO())
  2281. def test_patch_gerrit_conflict(self):
  2282. self._patch_common()
  2283. self.calls += [
  2284. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  2285. 'refs/changes/56/123456/7'],), ''),
  2286. ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
  2287. ]
  2288. with self.assertRaises(SystemExitMock):
  2289. git_cl.main(['patch', '123456'])
  2290. self.assertEqual(
  2291. 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
  2292. sys.stderr.getvalue())
  2293. @mock.patch(
  2294. 'gerrit_util.GetChangeDetail',
  2295. side_effect=gerrit_util.GerritError(404, ''))
  2296. @mock.patch('sys.stderr', StringIO())
  2297. def test_patch_gerrit_not_exists(self, *_mocks):
  2298. self.mockGit.config['remote.origin.url'] = (
  2299. 'https://chromium.googlesource.com/my/repo')
  2300. with self.assertRaises(SystemExitMock):
  2301. self.assertEqual(1, git_cl.main(['patch', '123456']))
  2302. self.assertEqual(
  2303. 'change 123456 at https://chromium-review.googlesource.com does not '
  2304. 'exist or you have no access to it\n',
  2305. sys.stderr.getvalue())
  2306. def _checkout_calls(self):
  2307. return [
  2308. ((['git', 'config', '--local', '--get-regexp',
  2309. 'branch\\..*\\.gerritissue'], ),
  2310. ('branch.ger-branch.gerritissue 123456\n'
  2311. 'branch.gbranch654.gerritissue 654321\n')),
  2312. ]
  2313. def test_checkout_gerrit(self):
  2314. """Tests git cl checkout <issue>."""
  2315. self.calls = self._checkout_calls()
  2316. self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
  2317. self.assertEqual(0, git_cl.main(['checkout', '123456']))
  2318. def test_checkout_not_found(self):
  2319. """Tests git cl checkout <issue>."""
  2320. self.calls = self._checkout_calls()
  2321. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  2322. def test_checkout_no_branch_issues(self):
  2323. """Tests git cl checkout <issue>."""
  2324. self.calls = [
  2325. ((['git', 'config', '--local', '--get-regexp',
  2326. 'branch\\..*\\.gerritissue'], ), CERR1),
  2327. ]
  2328. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  2329. def _test_gerrit_ensure_authenticated_common(self, auth):
  2330. mock.patch(
  2331. 'gclient_utils.AskForData',
  2332. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  2333. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2334. CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
  2335. self.mockGit.config['remote.origin.url'] = (
  2336. 'https://chromium.googlesource.com/my/repo')
  2337. cl = git_cl.Changelist()
  2338. cl.branch = 'main'
  2339. cl.branchref = 'refs/heads/main'
  2340. return cl
  2341. @mock.patch('sys.stderr', StringIO())
  2342. def test_gerrit_ensure_authenticated_missing(self):
  2343. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2344. 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
  2345. })
  2346. with self.assertRaises(SystemExitMock):
  2347. cl.EnsureAuthenticated(force=False)
  2348. self.assertEqual(
  2349. 'Credentials for the following hosts are required:\n'
  2350. ' chromium-review.googlesource.com\n'
  2351. 'These are read from ~%(sep)s.gitcookies '
  2352. '(or legacy ~%(sep)s%(netrc)s)\n'
  2353. 'You can (re)generate your credentials by visiting '
  2354. 'https://chromium.googlesource.com/new-password\n' % {
  2355. 'sep': os.sep,
  2356. 'netrc': NETRC_FILENAME,
  2357. }, sys.stderr.getvalue())
  2358. def test_gerrit_ensure_authenticated_conflict(self):
  2359. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2360. 'chromium.googlesource.com':
  2361. ('git-one.example.com', None, 'secret1'),
  2362. 'chromium-review.googlesource.com':
  2363. ('git-other.example.com', None, 'secret2'),
  2364. })
  2365. self.calls.append(
  2366. (('ask_for_data', 'If you know what you are doing '
  2367. 'press Enter to continue, or Ctrl+C to abort'), ''))
  2368. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2369. def test_gerrit_ensure_authenticated_ok(self):
  2370. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2371. 'chromium.googlesource.com':
  2372. ('git-same.example.com', None, 'secret'),
  2373. 'chromium-review.googlesource.com':
  2374. ('git-same.example.com', None, 'secret'),
  2375. })
  2376. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2377. def test_gerrit_ensure_authenticated_skipped(self):
  2378. self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
  2379. cl = self._test_gerrit_ensure_authenticated_common(auth={})
  2380. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2381. def test_gerrit_ensure_authenticated_bearer_token(self):
  2382. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2383. 'chromium.googlesource.com':
  2384. ('', None, 'secret'),
  2385. 'chromium-review.googlesource.com':
  2386. ('', None, 'secret'),
  2387. })
  2388. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2389. header = gerrit_util.CookiesAuthenticator().get_auth_header(
  2390. 'chromium.googlesource.com')
  2391. self.assertTrue('Bearer' in header)
  2392. def test_gerrit_ensure_authenticated_non_https(self):
  2393. self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
  2394. self.calls = [
  2395. (('logging.warning',
  2396. 'Ignoring branch %(branch)s with non-https/sso remote '
  2397. '%(remote)s', {
  2398. 'branch': 'main',
  2399. 'remote': 'custom-scheme://repo'
  2400. }), None),
  2401. ]
  2402. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2403. CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
  2404. mock.patch('logging.warning',
  2405. lambda *a: self._mocked_call('logging.warning', *a)).start()
  2406. cl = git_cl.Changelist()
  2407. cl.branch = 'main'
  2408. cl.branchref = 'refs/heads/main'
  2409. cl.lookedup_issue = True
  2410. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2411. def test_gerrit_ensure_authenticated_non_url(self):
  2412. self.mockGit.config['remote.origin.url'] = (
  2413. 'git@somehost.example:foo/bar.git')
  2414. self.calls = [
  2415. (('logging.error',
  2416. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  2417. 'but it doesn\'t exist.', {
  2418. 'remote': 'origin',
  2419. 'branch': 'main',
  2420. 'url': 'git@somehost.example:foo/bar.git'}
  2421. ), None),
  2422. ]
  2423. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2424. CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
  2425. mock.patch('logging.error',
  2426. lambda *a: self._mocked_call('logging.error', *a)).start()
  2427. cl = git_cl.Changelist()
  2428. cl.branch = 'main'
  2429. cl.branchref = 'refs/heads/main'
  2430. cl.lookedup_issue = True
  2431. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2432. def _cmd_set_commit_gerrit_common(self, vote, notify=None):
  2433. self.mockGit.config['branch.main.gerritissue'] = '123'
  2434. self.mockGit.config['branch.main.gerritserver'] = (
  2435. 'https://chromium-review.googlesource.com')
  2436. self.mockGit.config['remote.origin.url'] = (
  2437. 'https://chromium.googlesource.com/infra/infra')
  2438. self.calls = [
  2439. (('SetReview', 'chromium-review.googlesource.com',
  2440. 'infra%2Finfra~123', None,
  2441. {'Commit-Queue': vote}, notify, None), ''),
  2442. ]
  2443. def test_cmd_set_commit_gerrit_clear(self):
  2444. self._cmd_set_commit_gerrit_common(0)
  2445. self.assertEqual(0, git_cl.main(['set-commit', '-c']))
  2446. def test_cmd_set_commit_gerrit_dry(self):
  2447. self._cmd_set_commit_gerrit_common(1, notify=False)
  2448. self.assertEqual(0, git_cl.main(['set-commit', '-d']))
  2449. def test_cmd_set_commit_gerrit(self):
  2450. self._cmd_set_commit_gerrit_common(2)
  2451. self.assertEqual(0, git_cl.main(['set-commit']))
  2452. def test_description_display(self):
  2453. mock.patch('git_cl.Changelist', ChangelistMock).start()
  2454. ChangelistMock.desc = 'foo\n'
  2455. self.assertEqual(0, git_cl.main(['description', '-d']))
  2456. self.assertEqual('foo\n', sys.stdout.getvalue())
  2457. @mock.patch('sys.stderr', StringIO())
  2458. def test_StatusFieldOverrideIssueMissingArgs(self):
  2459. try:
  2460. self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
  2461. except SystemExitMock:
  2462. self.assertIn(
  2463. '--field must be given when --issue is set.', sys.stderr.getvalue())
  2464. def test_StatusFieldOverrideIssue(self):
  2465. def assertIssue(cl_self, *_args):
  2466. self.assertEqual(cl_self.issue, 1)
  2467. return 'foobar'
  2468. mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
  2469. self.assertEqual(
  2470. git_cl.main(['status', '--issue', '1', '--field', 'desc']),
  2471. 0)
  2472. self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
  2473. def test_SetCloseOverrideIssue(self):
  2474. def assertIssue(cl_self, *_args):
  2475. self.assertEqual(cl_self.issue, 1)
  2476. return 'foobar'
  2477. mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
  2478. mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
  2479. self.assertEqual(
  2480. git_cl.main(['set-close', '--issue', '1']), 0)
  2481. def test_description(self):
  2482. self.mockGit.config['remote.origin.url'] = (
  2483. 'https://chromium.googlesource.com/my/repo')
  2484. gerrit_util.GetChangeDetail.return_value = {
  2485. 'current_revision': 'sha1',
  2486. 'revisions': {'sha1': {
  2487. 'commit': {'message': 'foobar'},
  2488. }},
  2489. }
  2490. self.assertEqual(0, git_cl.main([
  2491. 'description',
  2492. 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
  2493. '-d']))
  2494. self.assertEqual('foobar\n', sys.stdout.getvalue())
  2495. def test_description_set_raw(self):
  2496. mock.patch('git_cl.Changelist', ChangelistMock).start()
  2497. mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
  2498. self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
  2499. self.assertEqual('hihi', ChangelistMock.desc)
  2500. def test_description_appends_bug_line(self):
  2501. current_desc = 'Some.\n\nChange-Id: xxx'
  2502. def RunEditor(desc, _, **kwargs):
  2503. self.assertEqual(
  2504. '# Enter a description of the change.\n'
  2505. '# This will be displayed on the codereview site.\n'
  2506. '# The first line will also be used as the subject of the review.\n'
  2507. '#--------------------This line is 72 characters long'
  2508. '--------------------\n'
  2509. 'Some.\n\nChange-Id: xxx\nBug: ',
  2510. desc)
  2511. # Simulate user changing something.
  2512. return 'Some.\n\nChange-Id: xxx\nBug: 123'
  2513. def UpdateDescription(_, desc, force=False):
  2514. self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
  2515. mock.patch('git_cl.Changelist.FetchDescription',
  2516. lambda *args: current_desc).start()
  2517. mock.patch('git_cl.Changelist.UpdateDescription',
  2518. UpdateDescription).start()
  2519. mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
  2520. self.mockGit.config['branch.main.gerritissue'] = '123'
  2521. self.assertEqual(0, git_cl.main(['description']))
  2522. def test_description_does_not_append_bug_line_if_fixed_is_present(self):
  2523. current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
  2524. def RunEditor(desc, _, **kwargs):
  2525. self.assertEqual(
  2526. '# Enter a description of the change.\n'
  2527. '# This will be displayed on the codereview site.\n'
  2528. '# The first line will also be used as the subject of the review.\n'
  2529. '#--------------------This line is 72 characters long'
  2530. '--------------------\n'
  2531. 'Some.\n\nFixed: 123\nChange-Id: xxx',
  2532. desc)
  2533. return desc
  2534. mock.patch('git_cl.Changelist.FetchDescription',
  2535. lambda *args: current_desc).start()
  2536. mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
  2537. self.mockGit.config['branch.main.gerritissue'] = '123'
  2538. self.assertEqual(0, git_cl.main(['description']))
  2539. def test_description_set_stdin(self):
  2540. mock.patch('git_cl.Changelist', ChangelistMock).start()
  2541. mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
  2542. self.assertEqual(0, git_cl.main(['description', '-n', '-']))
  2543. self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
  2544. def test_archive(self):
  2545. self.calls = [
  2546. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2547. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2548. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2549. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
  2550. ((['git', 'branch', '-D', 'foo'],), '')
  2551. ]
  2552. mock.patch('git_cl.get_cl_statuses',
  2553. lambda branches, fine_grained, max_processes:
  2554. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2555. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2556. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2557. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2558. def test_archive_tag_collision(self):
  2559. self.calls = [
  2560. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2561. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2562. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
  2563. 'refs/tags/git-cl-archived-456-foo'),
  2564. ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
  2565. ((['git', 'branch', '-D', 'foo'],), '')
  2566. ]
  2567. mock.patch('git_cl.get_cl_statuses',
  2568. lambda branches, fine_grained, max_processes:
  2569. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2570. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2571. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2572. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2573. def test_archive_current_branch_fails(self):
  2574. self.calls = [
  2575. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2576. 'refs/heads/main'),
  2577. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2578. ]
  2579. mock.patch('git_cl.get_cl_statuses',
  2580. lambda branches, fine_grained, max_processes:
  2581. [(MockChangelistWithBranchAndIssue('main', 1),
  2582. 'closed')]).start()
  2583. self.assertEqual(1, git_cl.main(['archive', '-f']))
  2584. def test_archive_dry_run(self):
  2585. self.calls = [
  2586. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2587. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2588. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2589. ]
  2590. mock.patch('git_cl.get_cl_statuses',
  2591. lambda branches, fine_grained, max_processes:
  2592. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2593. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2594. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2595. self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
  2596. def test_archive_no_tags(self):
  2597. self.calls = [
  2598. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2599. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2600. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2601. ((['git', 'branch', '-D', 'foo'],), '')
  2602. ]
  2603. mock.patch('git_cl.get_cl_statuses',
  2604. lambda branches, fine_grained, max_processes:
  2605. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2606. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2607. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2608. self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
  2609. def test_archive_tag_cleanup_on_branch_deletion_error(self):
  2610. self.calls = [
  2611. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2612. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2613. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2614. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
  2615. 'refs/tags/git-cl-archived-456-foo'),
  2616. ((['git', 'branch', '-D', 'foo'],), CERR1),
  2617. ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
  2618. 'refs/tags/git-cl-archived-456-foo'),
  2619. ]
  2620. mock.patch('git_cl.get_cl_statuses',
  2621. lambda branches, fine_grained, max_processes:
  2622. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2623. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2624. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2625. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2626. def test_archive_with_format(self):
  2627. self.calls = [
  2628. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'], ),
  2629. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2630. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'], ), ''),
  2631. ((['git', 'tag', 'archived/12-foo', 'foo'], ), ''),
  2632. ((['git', 'branch', '-D', 'foo'], ), ''),
  2633. ]
  2634. mock.patch('git_cl.get_cl_statuses',
  2635. lambda branches, fine_grained, max_processes:
  2636. [(MockChangelistWithBranchAndIssue('foo', 12), 'closed')]).start()
  2637. self.assertEqual(
  2638. 0, git_cl.main(['archive', '-f', '-p', 'archived/{issue}-{branch}']))
  2639. def test_cmd_issue_erase_existing(self):
  2640. self.mockGit.config['branch.main.gerritissue'] = '123'
  2641. self.mockGit.config['branch.main.gerritserver'] = (
  2642. 'https://chromium-review.googlesource.com')
  2643. self.calls = [
  2644. ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
  2645. ]
  2646. self.assertEqual(0, git_cl.main(['issue', '0']))
  2647. self.assertNotIn('branch.main.gerritissue', self.mockGit.config)
  2648. self.assertNotIn('branch.main.gerritserver', self.mockGit.config)
  2649. def test_cmd_issue_erase_existing_with_change_id(self):
  2650. self.mockGit.config['branch.main.gerritissue'] = '123'
  2651. self.mockGit.config['branch.main.gerritserver'] = (
  2652. 'https://chromium-review.googlesource.com')
  2653. mock.patch('git_cl.Changelist.FetchDescription',
  2654. lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
  2655. self.calls = [
  2656. ((['git', 'log', '-1', '--format=%B'],),
  2657. 'This is a description\n\nChange-Id: Ideadbeef'),
  2658. ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
  2659. ]
  2660. self.assertEqual(0, git_cl.main(['issue', '0']))
  2661. self.assertNotIn('branch.main.gerritissue', self.mockGit.config)
  2662. self.assertNotIn('branch.main.gerritserver', self.mockGit.config)
  2663. def test_cmd_issue_json(self):
  2664. self.mockGit.config['branch.main.gerritissue'] = '123'
  2665. self.mockGit.config['branch.main.gerritserver'] = (
  2666. 'https://chromium-review.googlesource.com')
  2667. self.mockGit.config['remote.origin.url'] = (
  2668. 'https://chromium.googlesource.com/chromium/src'
  2669. )
  2670. self.calls = [(
  2671. (
  2672. 'write_json',
  2673. 'output.json',
  2674. {
  2675. 'issue': 123,
  2676. 'issue_url': 'https://chromium-review.googlesource.com/123',
  2677. 'gerrit_host': 'chromium-review.googlesource.com',
  2678. 'gerrit_project': 'chromium/src',
  2679. },
  2680. ),
  2681. '',
  2682. )]
  2683. self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
  2684. def _common_GerritCommitMsgHookCheck(self):
  2685. mock.patch(
  2686. 'git_cl.os.path.abspath',
  2687. lambda path: self._mocked_call(['abspath', path])).start()
  2688. mock.patch(
  2689. 'git_cl.os.path.exists',
  2690. lambda path: self._mocked_call(['exists', path])).start()
  2691. mock.patch(
  2692. 'git_cl.gclient_utils.FileRead',
  2693. lambda path: self._mocked_call(['FileRead', path])).start()
  2694. mock.patch(
  2695. 'git_cl.gclient_utils.rm_file_or_tree',
  2696. lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
  2697. mock.patch(
  2698. 'gclient_utils.AskForData',
  2699. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  2700. return git_cl.Changelist(issue=123)
  2701. def test_GerritCommitMsgHookCheck_custom_hook(self):
  2702. cl = self._common_GerritCommitMsgHookCheck()
  2703. self.calls += [((['exists',
  2704. os.path.join('.git', 'hooks', 'commit-msg')], ), True),
  2705. ((['FileRead',
  2706. os.path.join('.git', 'hooks', 'commit-msg')], ),
  2707. '#!/bin/sh\necho "custom hook"')]
  2708. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2709. def test_GerritCommitMsgHookCheck_not_exists(self):
  2710. cl = self._common_GerritCommitMsgHookCheck()
  2711. self.calls += [
  2712. ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), False),
  2713. ]
  2714. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2715. def test_GerritCommitMsgHookCheck(self):
  2716. cl = self._common_GerritCommitMsgHookCheck()
  2717. self.calls += [
  2718. ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), True),
  2719. ((['FileRead', os.path.join('.git', 'hooks', 'commit-msg')], ),
  2720. '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
  2721. (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
  2722. ((['rm_file_or_tree',
  2723. os.path.join('.git', 'hooks', 'commit-msg')], ), ''),
  2724. ]
  2725. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2726. def test_GerritCmdLand(self):
  2727. self.mockGit.config['branch.main.gerritsquashhash'] = 'deadbeaf'
  2728. self.mockGit.config['branch.main.gerritserver'] = (
  2729. 'chromium-review.googlesource.com')
  2730. self.calls += [
  2731. ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
  2732. ]
  2733. cl = git_cl.Changelist(issue=123)
  2734. cl._GetChangeDetail = lambda *args, **kwargs: {
  2735. 'labels': {},
  2736. 'current_revision': 'deadbeaf',
  2737. }
  2738. cl._GetChangeCommit = lambda: {
  2739. 'commit': 'deadbeef',
  2740. 'web_links': [{'name': 'gitiles',
  2741. 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
  2742. }
  2743. cl.SubmitIssue = lambda: None
  2744. self.assertEqual(0, cl.CMDLand(force=True,
  2745. bypass_hooks=True,
  2746. verbose=True,
  2747. parallel=False,
  2748. resultdb=False,
  2749. realm=None))
  2750. self.assertIn(
  2751. 'Issue chromium-review.googlesource.com/123 has been submitted',
  2752. sys.stdout.getvalue())
  2753. self.assertIn(
  2754. 'Landed as: https://git.googlesource.com/test/+/deadbeef',
  2755. sys.stdout.getvalue())
  2756. def _mock_gerrit_changes_for_detail_cache(self):
  2757. mock.patch('git_cl.Changelist.GetGerritHost', lambda _: 'host').start()
  2758. def test_gerrit_change_detail_cache_simple(self):
  2759. self._mock_gerrit_changes_for_detail_cache()
  2760. gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
  2761. cl1 = git_cl.Changelist(issue=1)
  2762. cl1._cached_remote_url = (
  2763. True, 'https://chromium.googlesource.com/a/my/repo.git/')
  2764. cl2 = git_cl.Changelist(issue=2)
  2765. cl2._cached_remote_url = (
  2766. True, 'https://chromium.googlesource.com/ab/repo')
  2767. self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
  2768. self.assertEqual(cl1._GetChangeDetail(), 'a')
  2769. self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
  2770. def test_gerrit_change_detail_cache_options(self):
  2771. self._mock_gerrit_changes_for_detail_cache()
  2772. gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
  2773. cl = git_cl.Changelist(issue=1)
  2774. cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
  2775. self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
  2776. self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
  2777. self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
  2778. self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
  2779. self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
  2780. self.assertEqual(cl._GetChangeDetail(), 'cab')
  2781. self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
  2782. self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
  2783. self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
  2784. self.assertEqual(cl._GetChangeDetail(), 'cab')
  2785. def test_gerrit_description_caching(self):
  2786. gerrit_util.GetChangeDetail.return_value = {
  2787. 'current_revision': 'rev1',
  2788. 'revisions': {
  2789. 'rev1': {'commit': {'message': 'desc1'}},
  2790. },
  2791. }
  2792. self._mock_gerrit_changes_for_detail_cache()
  2793. cl = git_cl.Changelist(issue=1)
  2794. cl._cached_remote_url = (
  2795. True, 'https://chromium.googlesource.com/a/my/repo.git/')
  2796. self.assertEqual(cl.FetchDescription(), 'desc1')
  2797. self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
  2798. def test_print_current_creds(self):
  2799. class CookiesAuthenticatorMock(object):
  2800. def __init__(self):
  2801. self.gitcookies = {
  2802. 'host.googlesource.com': ('user', 'pass'),
  2803. 'host-review.googlesource.com': ('user', 'pass'),
  2804. }
  2805. self.netrc = self
  2806. self.netrc.hosts = {
  2807. 'github.com': ('user2', None, 'pass2'),
  2808. 'host2.googlesource.com': ('user3', None, 'pass'),
  2809. }
  2810. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2811. CookiesAuthenticatorMock).start()
  2812. git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
  2813. self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
  2814. ' Host\t User\t Which file',
  2815. '============================\t=====\t===========',
  2816. 'host-review.googlesource.com\t user\t.gitcookies',
  2817. ' host.googlesource.com\t user\t.gitcookies',
  2818. ' host2.googlesource.com\tuser3\t .netrc',
  2819. ])
  2820. sys.stdout.seek(0)
  2821. sys.stdout.truncate(0)
  2822. git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
  2823. self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
  2824. ' Host\tUser\t Which file',
  2825. '============================\t====\t===========',
  2826. 'host-review.googlesource.com\tuser\t.gitcookies',
  2827. ' host.googlesource.com\tuser\t.gitcookies',
  2828. ])
  2829. def _common_creds_check_mocks(self):
  2830. def exists_mock(path):
  2831. dirname = os.path.dirname(path)
  2832. if dirname == os.path.expanduser('~'):
  2833. dirname = '~'
  2834. base = os.path.basename(path)
  2835. if base in (NETRC_FILENAME, '.gitcookies'):
  2836. return self._mocked_call('os.path.exists', os.path.join(dirname, base))
  2837. # git cl also checks for existence other files not relevant to this test.
  2838. return None
  2839. mock.patch(
  2840. 'gclient_utils.AskForData',
  2841. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  2842. mock.patch('os.path.exists', exists_mock).start()
  2843. def test_creds_check_gitcookies_not_configured(self):
  2844. self._common_creds_check_mocks()
  2845. mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
  2846. lambda _, include_netrc=False: []).start()
  2847. self.calls = [
  2848. ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
  2849. ((['git', 'config', '--global', 'http.cookiefile'], ), CERR1),
  2850. (('os.path.exists', os.path.join('~', NETRC_FILENAME)), True),
  2851. (('ask_for_data', 'Press Enter to setup .gitcookies, '
  2852. 'or Ctrl+C to abort'), ''),
  2853. (([
  2854. 'git', 'config', '--global', 'http.cookiefile',
  2855. os.path.expanduser(os.path.join('~', '.gitcookies'))
  2856. ], ), ''),
  2857. ]
  2858. self.assertEqual(0, git_cl.main(['creds-check']))
  2859. self.assertTrue(
  2860. sys.stdout.getvalue().startswith(
  2861. 'You seem to be using outdated .netrc for git credentials:'))
  2862. self.assertIn(
  2863. '\nConfigured git to use .gitcookies from',
  2864. sys.stdout.getvalue())
  2865. def test_creds_check_gitcookies_configured_custom_broken(self):
  2866. self._common_creds_check_mocks()
  2867. mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
  2868. lambda _, include_netrc=False: []).start()
  2869. custom_cookie_path = ('C:\\.gitcookies'
  2870. if sys.platform == 'win32' else '/custom/.gitcookies')
  2871. self.calls = [
  2872. ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
  2873. ((['git', 'config', '--global', 'http.cookiefile'], ),
  2874. custom_cookie_path),
  2875. (('os.path.exists', custom_cookie_path), False),
  2876. (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
  2877. 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
  2878. (([
  2879. 'git', 'config', '--global', 'http.cookiefile',
  2880. os.path.expanduser(os.path.join('~', '.gitcookies'))
  2881. ], ), ''),
  2882. ]
  2883. self.assertEqual(0, git_cl.main(['creds-check']))
  2884. self.assertIn(
  2885. 'WARNING: You have configured custom path to .gitcookies: ',
  2886. sys.stdout.getvalue())
  2887. self.assertIn(
  2888. 'However, your configured .gitcookies file is missing.',
  2889. sys.stdout.getvalue())
  2890. def test_git_cl_comment_add_gerrit(self):
  2891. self.mockGit.branchref = None
  2892. self.mockGit.config['remote.origin.url'] = (
  2893. 'https://chromium.googlesource.com/infra/infra')
  2894. self.calls = [
  2895. (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
  2896. 'msg', None, None, None),
  2897. None),
  2898. ]
  2899. self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
  2900. @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
  2901. def test_git_cl_comments_fetch_gerrit(self, *_mocks):
  2902. self.mockGit.config['remote.origin.url'] = (
  2903. 'https://chromium.googlesource.com/infra/infra')
  2904. gerrit_util.GetChangeDetail.return_value = {
  2905. 'owner': {'email': 'owner@example.com'},
  2906. 'current_revision': 'ba5eba11',
  2907. 'revisions': {
  2908. 'deadbeaf': {
  2909. '_number': 1,
  2910. },
  2911. 'ba5eba11': {
  2912. '_number': 2,
  2913. },
  2914. },
  2915. 'messages': [
  2916. {
  2917. u'_revision_number': 1,
  2918. u'author': {
  2919. u'_account_id': 1111084,
  2920. u'email': u'could-be-anything@example.com',
  2921. u'name': u'LUCI CQ'
  2922. },
  2923. u'date': u'2017-03-15 20:08:45.000000000',
  2924. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
  2925. u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
  2926. u'tag': u'autogenerated:cv:dry-run'
  2927. },
  2928. {
  2929. u'_revision_number': 2,
  2930. u'author': {
  2931. u'_account_id': 11151243,
  2932. u'email': u'owner@example.com',
  2933. u'name': u'owner'
  2934. },
  2935. u'date': u'2017-03-16 20:00:41.000000000',
  2936. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  2937. u'message': u'PTAL',
  2938. },
  2939. {
  2940. u'_revision_number': 2,
  2941. u'author': {
  2942. u'_account_id': 148512,
  2943. u'email': u'reviewer@example.com',
  2944. u'name': u'reviewer'
  2945. },
  2946. u'date': u'2017-03-17 05:19:37.500000000',
  2947. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
  2948. u'message': u'Patch Set 2: Code-Review+1',
  2949. },
  2950. {
  2951. u'_revision_number': 2,
  2952. u'author': {
  2953. u'_account_id': 42,
  2954. u'name': u'reviewer'
  2955. },
  2956. u'date': u'2017-03-17 05:19:37.900000000',
  2957. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d0000',
  2958. u'message': u'A bot with no email set',
  2959. },
  2960. ]
  2961. }
  2962. self.calls = [
  2963. (('GetChangeComments', 'chromium-review.googlesource.com',
  2964. 'infra%2Finfra~1'), {
  2965. '/COMMIT_MSG': [
  2966. {
  2967. 'author': {
  2968. 'email': u'reviewer@example.com'
  2969. },
  2970. 'updated': u'2017-03-17 05:19:37.500000000',
  2971. 'patch_set': 2,
  2972. 'side': 'REVISION',
  2973. 'message': 'Please include a bug link',
  2974. },
  2975. ],
  2976. 'codereview.settings': [
  2977. {
  2978. 'author': {
  2979. 'email': u'owner@example.com'
  2980. },
  2981. 'updated': u'2017-03-16 20:00:41.000000000',
  2982. 'patch_set': 2,
  2983. 'side': 'PARENT',
  2984. 'line': 42,
  2985. 'message': 'I removed this because it is bad',
  2986. },
  2987. ]
  2988. }),
  2989. (('GetChangeRobotComments', 'chromium-review.googlesource.com',
  2990. 'infra%2Finfra~1'), {}),
  2991. ] * 2 + [(('write_json', 'output.json', [{
  2992. u'date':
  2993. u'2017-03-16 20:00:41.000000',
  2994. u'message': (u'PTAL\n' + u'\n' + u'codereview.settings\n' +
  2995. u' Base, Line 42: https://crrev.com/c/1/2/'
  2996. u'codereview.settings#b42\n' +
  2997. u' I removed this because it is bad\n'),
  2998. u'autogenerated':
  2999. False,
  3000. u'approval':
  3001. False,
  3002. u'disapproval':
  3003. False,
  3004. u'sender':
  3005. u'owner@example.com'
  3006. }, {
  3007. u'date':
  3008. u'2017-03-17 05:19:37.500000',
  3009. u'message':
  3010. (u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
  3011. u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
  3012. u' Please include a bug link\n'),
  3013. u'autogenerated':
  3014. False,
  3015. u'approval':
  3016. False,
  3017. u'disapproval':
  3018. False,
  3019. u'sender':
  3020. u'reviewer@example.com'
  3021. }]), '')]
  3022. expected_comments_summary = [
  3023. git_cl._CommentSummary(
  3024. message=(u'PTAL\n' + u'\n' + u'codereview.settings\n' +
  3025. u' Base, Line 42: https://crrev.com/c/1/2/' +
  3026. u'codereview.settings#b42\n' +
  3027. u' I removed this because it is bad\n'),
  3028. date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
  3029. autogenerated=False,
  3030. disapproval=False,
  3031. approval=False,
  3032. sender=u'owner@example.com'),
  3033. git_cl._CommentSummary(message=(
  3034. u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
  3035. u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
  3036. u' Please include a bug link\n'),
  3037. date=datetime.datetime(2017, 3, 17, 5, 19, 37,
  3038. 500000),
  3039. autogenerated=False,
  3040. disapproval=False,
  3041. approval=False,
  3042. sender=u'reviewer@example.com'),
  3043. ]
  3044. cl = git_cl.Changelist(
  3045. issue=1, branchref='refs/heads/foo')
  3046. self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
  3047. self.assertEqual(
  3048. 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
  3049. def test_git_cl_comments_robot_comments(self):
  3050. # git cl comments also fetches robot comments (which are considered a type
  3051. # of autogenerated comment), and unlike other types of comments, only robot
  3052. # comments from the latest patchset are shown.
  3053. self.mockGit.config['remote.origin.url'] = (
  3054. 'https://x.googlesource.com/infra/infra')
  3055. gerrit_util.GetChangeDetail.return_value = {
  3056. 'owner': {'email': 'owner@example.com'},
  3057. 'current_revision': 'ba5eba11',
  3058. 'revisions': {
  3059. 'deadbeaf': {
  3060. '_number': 1,
  3061. },
  3062. 'ba5eba11': {
  3063. '_number': 2,
  3064. },
  3065. },
  3066. 'messages': [
  3067. {
  3068. u'_revision_number': 1,
  3069. u'author': {
  3070. u'_account_id': 1111084,
  3071. u'email': u'commit-bot@chromium.org',
  3072. u'name': u'Commit Bot'
  3073. },
  3074. u'date': u'2017-03-15 20:08:45.000000000',
  3075. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
  3076. u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
  3077. u'tag': u'autogenerated:cq:dry-run'
  3078. },
  3079. {
  3080. u'_revision_number': 1,
  3081. u'author': {
  3082. u'_account_id': 123,
  3083. u'email': u'tricium@serviceaccount.com',
  3084. u'name': u'Tricium'
  3085. },
  3086. u'date': u'2017-03-16 20:00:41.000000000',
  3087. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  3088. u'message': u'(1 comment)',
  3089. u'tag': u'autogenerated:tricium',
  3090. },
  3091. {
  3092. u'_revision_number': 1,
  3093. u'author': {
  3094. u'_account_id': 123,
  3095. u'email': u'tricium@serviceaccount.com',
  3096. u'name': u'Tricium'
  3097. },
  3098. u'date': u'2017-03-16 20:00:41.000000000',
  3099. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  3100. u'message': u'(1 comment)',
  3101. u'tag': u'autogenerated:tricium',
  3102. },
  3103. {
  3104. u'_revision_number': 2,
  3105. u'author': {
  3106. u'_account_id': 123,
  3107. u'email': u'tricium@serviceaccount.com',
  3108. u'name': u'reviewer'
  3109. },
  3110. u'date': u'2017-03-17 05:30:37.000000000',
  3111. u'tag': u'autogenerated:tricium',
  3112. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
  3113. u'message': u'(1 comment)',
  3114. },
  3115. ]
  3116. }
  3117. self.calls = [
  3118. (('GetChangeComments', 'x-review.googlesource.com', 'infra%2Finfra~1'),
  3119. {}),
  3120. (('GetChangeRobotComments', 'x-review.googlesource.com',
  3121. 'infra%2Finfra~1'), {
  3122. 'codereview.settings': [
  3123. {
  3124. u'author': {
  3125. u'email': u'tricium@serviceaccount.com'
  3126. },
  3127. u'updated': u'2017-03-17 05:30:37.000000000',
  3128. u'robot_run_id': u'5565031076855808',
  3129. u'robot_id': u'Linter/Category',
  3130. u'tag': u'autogenerated:tricium',
  3131. u'patch_set': 2,
  3132. u'side': u'REVISION',
  3133. u'message': u'Linter warning message text',
  3134. u'line': 32,
  3135. },
  3136. ],
  3137. }),
  3138. ]
  3139. expected_comments_summary = [
  3140. git_cl._CommentSummary(
  3141. date=datetime.datetime(2017, 3, 17, 5, 30, 37),
  3142. message=(u'(1 comment)\n\ncodereview.settings\n'
  3143. u' PS2, Line 32: https://x-review.googlesource.com/c/1/2/'
  3144. u'codereview.settings#32\n'
  3145. u' Linter warning message text\n'),
  3146. sender=u'tricium@serviceaccount.com',
  3147. autogenerated=True,
  3148. approval=False,
  3149. disapproval=False)
  3150. ]
  3151. cl = git_cl.Changelist(
  3152. issue=1, branchref='refs/heads/foo')
  3153. self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
  3154. def test_get_remote_url_with_mirror(self):
  3155. original_os_path_isdir = os.path.isdir
  3156. def selective_os_path_isdir_mock(path):
  3157. if path == '/cache/this-dir-exists':
  3158. return self._mocked_call('os.path.isdir', path)
  3159. return original_os_path_isdir(path)
  3160. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  3161. url = 'https://chromium.googlesource.com/my/repo'
  3162. self.mockGit.config['remote.origin.url'] = (
  3163. '/cache/this-dir-exists')
  3164. self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
  3165. url)
  3166. self.calls = [
  3167. (('os.path.isdir', '/cache/this-dir-exists'),
  3168. True),
  3169. ]
  3170. cl = git_cl.Changelist(issue=1)
  3171. self.assertEqual(cl.GetRemoteUrl(), url)
  3172. self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
  3173. def test_get_remote_url_non_existing_mirror(self):
  3174. original_os_path_isdir = os.path.isdir
  3175. def selective_os_path_isdir_mock(path):
  3176. if path == '/cache/this-dir-doesnt-exist':
  3177. return self._mocked_call('os.path.isdir', path)
  3178. return original_os_path_isdir(path)
  3179. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  3180. mock.patch('logging.error',
  3181. lambda *a: self._mocked_call('logging.error', *a)).start()
  3182. self.mockGit.config['remote.origin.url'] = (
  3183. '/cache/this-dir-doesnt-exist')
  3184. self.calls = [
  3185. (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
  3186. False),
  3187. (('logging.error',
  3188. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  3189. 'but it doesn\'t exist.', {
  3190. 'remote': 'origin',
  3191. 'branch': 'main',
  3192. 'url': '/cache/this-dir-doesnt-exist'}
  3193. ), None),
  3194. ]
  3195. cl = git_cl.Changelist(issue=1)
  3196. self.assertIsNone(cl.GetRemoteUrl())
  3197. def test_get_remote_url_misconfigured_mirror(self):
  3198. original_os_path_isdir = os.path.isdir
  3199. def selective_os_path_isdir_mock(path):
  3200. if path == '/cache/this-dir-exists':
  3201. return self._mocked_call('os.path.isdir', path)
  3202. return original_os_path_isdir(path)
  3203. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  3204. mock.patch('logging.error',
  3205. lambda *a: self._mocked_call('logging.error', *a)).start()
  3206. self.mockGit.config['remote.origin.url'] = (
  3207. '/cache/this-dir-exists')
  3208. self.calls = [
  3209. (('os.path.isdir', '/cache/this-dir-exists'), True),
  3210. (('logging.error',
  3211. 'Remote "%(remote)s" for branch "%(branch)s" points to '
  3212. '"%(cache_path)s", but it is misconfigured.\n'
  3213. '"%(cache_path)s" must be a git repo and must have a remote named '
  3214. '"%(remote)s" pointing to the git host.', {
  3215. 'remote': 'origin',
  3216. 'cache_path': '/cache/this-dir-exists',
  3217. 'branch': 'main'}
  3218. ), None),
  3219. ]
  3220. cl = git_cl.Changelist(issue=1)
  3221. self.assertIsNone(cl.GetRemoteUrl())
  3222. def test_gerrit_change_identifier_with_project(self):
  3223. self.mockGit.config['remote.origin.url'] = (
  3224. 'https://chromium.googlesource.com/a/my/repo.git/')
  3225. cl = git_cl.Changelist(issue=123456)
  3226. self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
  3227. def test_gerrit_change_identifier_without_project(self):
  3228. mock.patch('logging.error',
  3229. lambda *a: self._mocked_call('logging.error', *a)).start()
  3230. self.calls = [
  3231. (('logging.error',
  3232. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  3233. 'but it doesn\'t exist.', {
  3234. 'remote': 'origin',
  3235. 'branch': 'main',
  3236. 'url': ''}
  3237. ), None),
  3238. ]
  3239. cl = git_cl.Changelist(issue=123456)
  3240. self.assertEqual(cl._GerritChangeIdentifier(), '123456')
  3241. def test_gerrit_new_default(self):
  3242. self._run_gerrit_upload_test(
  3243. [],
  3244. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  3245. [],
  3246. squash=False,
  3247. squash_mode='override_nosquash',
  3248. change_id='I123456789',
  3249. default_branch='main')
  3250. class ChangelistTest(unittest.TestCase):
  3251. LAST_COMMIT_SUBJECT = 'Fixes goat teleporter destination to be Australia'
  3252. def _mock_run_git(commands):
  3253. if commands == ['show', '-s', '--format=%s', 'HEAD']:
  3254. return ChangelistTest.LAST_COMMIT_SUBJECT
  3255. def setUp(self):
  3256. super(ChangelistTest, self).setUp()
  3257. mock.patch('gclient_utils.FileRead').start()
  3258. mock.patch('gclient_utils.FileWrite').start()
  3259. mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start()
  3260. mock.patch(
  3261. 'git_cl.Changelist.GetCodereviewServer',
  3262. return_value='https://chromium-review.googlesource.com').start()
  3263. mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
  3264. mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
  3265. mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start()
  3266. mock.patch(
  3267. 'git_cl.Changelist.GetRemoteBranch',
  3268. return_value=('origin', 'refs/remotes/origin/main')).start()
  3269. mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start()
  3270. mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
  3271. mock.patch('git_cl.Settings.GetIsGerrit', return_value=True).start()
  3272. mock.patch('git_cl.time_time').start()
  3273. mock.patch('metrics.collector').start()
  3274. mock.patch('subprocess2.Popen').start()
  3275. mock.patch(
  3276. 'git_cl.Changelist.GetGerritProject', return_value='project').start()
  3277. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  3278. self.addCleanup(mock.patch.stopall)
  3279. self.temp_count = 0
  3280. self.mockGit = GitMocks()
  3281. mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
  3282. mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
  3283. def testRunHook(self):
  3284. expected_results = {
  3285. 'more_cc': ['cc@example.com', 'more@example.com'],
  3286. 'errors': [],
  3287. 'notifications': [],
  3288. 'warnings': [],
  3289. }
  3290. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3291. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3292. mockProcess = mock.Mock()
  3293. mockProcess.wait.return_value = 0
  3294. subprocess2.Popen.return_value = mockProcess
  3295. cl = git_cl.Changelist()
  3296. results = cl.RunHook(
  3297. committing=True,
  3298. may_prompt=True,
  3299. verbose=2,
  3300. parallel=True,
  3301. upstream='upstream',
  3302. description='description',
  3303. all_files=True,
  3304. resultdb=False)
  3305. self.assertEqual(expected_results, results)
  3306. subprocess2.Popen.assert_any_call([
  3307. 'vpython3', 'PRESUBMIT_SUPPORT',
  3308. '--root', 'root',
  3309. '--upstream', 'upstream',
  3310. '--verbose', '--verbose',
  3311. '--gerrit_url', 'https://chromium-review.googlesource.com',
  3312. '--gerrit_project', 'project',
  3313. '--gerrit_branch', 'refs/heads/main',
  3314. '--author', 'author',
  3315. '--issue', '123456',
  3316. '--patchset', '7',
  3317. '--commit',
  3318. '--may_prompt',
  3319. '--parallel',
  3320. '--all_files',
  3321. '--no_diffs',
  3322. '--json_output', '/tmp/fake-temp2',
  3323. '--description_file', '/tmp/fake-temp1',
  3324. ])
  3325. gclient_utils.FileWrite.assert_any_call(
  3326. '/tmp/fake-temp1', 'description')
  3327. metrics.collector.add_repeated('sub_commands', {
  3328. 'command': 'presubmit',
  3329. 'execution_time': 100,
  3330. 'exit_code': 0,
  3331. })
  3332. def testRunHook_FewerOptions(self):
  3333. expected_results = {
  3334. 'more_cc': ['cc@example.com', 'more@example.com'],
  3335. 'errors': [],
  3336. 'notifications': [],
  3337. 'warnings': [],
  3338. }
  3339. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3340. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3341. mockProcess = mock.Mock()
  3342. mockProcess.wait.return_value = 0
  3343. subprocess2.Popen.return_value = mockProcess
  3344. git_cl.Changelist.GetAuthor.return_value = None
  3345. git_cl.Changelist.GetIssue.return_value = None
  3346. git_cl.Changelist.GetPatchset.return_value = None
  3347. cl = git_cl.Changelist()
  3348. results = cl.RunHook(
  3349. committing=False,
  3350. may_prompt=False,
  3351. verbose=0,
  3352. parallel=False,
  3353. upstream='upstream',
  3354. description='description',
  3355. all_files=False,
  3356. resultdb=False)
  3357. self.assertEqual(expected_results, results)
  3358. subprocess2.Popen.assert_any_call([
  3359. 'vpython3', 'PRESUBMIT_SUPPORT',
  3360. '--root', 'root',
  3361. '--upstream', 'upstream',
  3362. '--gerrit_url', 'https://chromium-review.googlesource.com',
  3363. '--gerrit_project', 'project',
  3364. '--gerrit_branch', 'refs/heads/main',
  3365. '--upload',
  3366. '--json_output', '/tmp/fake-temp2',
  3367. '--description_file', '/tmp/fake-temp1',
  3368. ])
  3369. gclient_utils.FileWrite.assert_any_call(
  3370. '/tmp/fake-temp1', 'description')
  3371. metrics.collector.add_repeated('sub_commands', {
  3372. 'command': 'presubmit',
  3373. 'execution_time': 100,
  3374. 'exit_code': 0,
  3375. })
  3376. def testRunHook_FewerOptionsResultDB(self):
  3377. expected_results = {
  3378. 'more_cc': ['cc@example.com', 'more@example.com'],
  3379. 'errors': [],
  3380. 'notifications': [],
  3381. 'warnings': [],
  3382. }
  3383. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3384. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3385. mockProcess = mock.Mock()
  3386. mockProcess.wait.return_value = 0
  3387. subprocess2.Popen.return_value = mockProcess
  3388. git_cl.Changelist.GetAuthor.return_value = None
  3389. git_cl.Changelist.GetIssue.return_value = None
  3390. git_cl.Changelist.GetPatchset.return_value = None
  3391. cl = git_cl.Changelist()
  3392. results = cl.RunHook(
  3393. committing=False,
  3394. may_prompt=False,
  3395. verbose=0,
  3396. parallel=False,
  3397. upstream='upstream',
  3398. description='description',
  3399. all_files=False,
  3400. resultdb=True,
  3401. realm='chromium:public')
  3402. self.assertEqual(expected_results, results)
  3403. subprocess2.Popen.assert_any_call([
  3404. 'rdb', 'stream', '-new', '-realm', 'chromium:public', '--',
  3405. 'vpython3', 'PRESUBMIT_SUPPORT',
  3406. '--root', 'root',
  3407. '--upstream', 'upstream',
  3408. '--gerrit_url', 'https://chromium-review.googlesource.com',
  3409. '--gerrit_project', 'project',
  3410. '--gerrit_branch', 'refs/heads/main',
  3411. '--upload',
  3412. '--json_output', '/tmp/fake-temp2',
  3413. '--description_file', '/tmp/fake-temp1',
  3414. ])
  3415. def testRunHook_NoGerrit(self):
  3416. mock.patch('git_cl.Settings.GetIsGerrit', return_value=False).start()
  3417. expected_results = {
  3418. 'more_cc': ['cc@example.com', 'more@example.com'],
  3419. 'errors': [],
  3420. 'notifications': [],
  3421. 'warnings': [],
  3422. }
  3423. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3424. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3425. mockProcess = mock.Mock()
  3426. mockProcess.wait.return_value = 0
  3427. subprocess2.Popen.return_value = mockProcess
  3428. git_cl.Changelist.GetAuthor.return_value = None
  3429. git_cl.Changelist.GetIssue.return_value = None
  3430. git_cl.Changelist.GetPatchset.return_value = None
  3431. cl = git_cl.Changelist()
  3432. results = cl.RunHook(
  3433. committing=False,
  3434. may_prompt=False,
  3435. verbose=0,
  3436. parallel=False,
  3437. upstream='upstream',
  3438. description='description',
  3439. all_files=False,
  3440. resultdb=False)
  3441. self.assertEqual(expected_results, results)
  3442. subprocess2.Popen.assert_any_call([
  3443. 'vpython3', 'PRESUBMIT_SUPPORT',
  3444. '--root', 'root',
  3445. '--upstream', 'upstream',
  3446. '--upload',
  3447. '--json_output', '/tmp/fake-temp2',
  3448. '--description_file', '/tmp/fake-temp1',
  3449. ])
  3450. gclient_utils.FileWrite.assert_any_call(
  3451. '/tmp/fake-temp1', 'description')
  3452. metrics.collector.add_repeated('sub_commands', {
  3453. 'command': 'presubmit',
  3454. 'execution_time': 100,
  3455. 'exit_code': 0,
  3456. })
  3457. @mock.patch('sys.exit', side_effect=SystemExitMock)
  3458. def testRunHook_Failure(self, _mock):
  3459. git_cl.time_time.side_effect = [100, 200]
  3460. mockProcess = mock.Mock()
  3461. mockProcess.wait.return_value = 2
  3462. subprocess2.Popen.return_value = mockProcess
  3463. cl = git_cl.Changelist()
  3464. with self.assertRaises(SystemExitMock):
  3465. cl.RunHook(
  3466. committing=True,
  3467. may_prompt=True,
  3468. verbose=2,
  3469. parallel=True,
  3470. upstream='upstream',
  3471. description='description',
  3472. all_files=True,
  3473. resultdb=False)
  3474. sys.exit.assert_called_once_with(2)
  3475. def testRunPostUploadHook(self):
  3476. cl = git_cl.Changelist()
  3477. cl.RunPostUploadHook(2, 'upstream', 'description')
  3478. subprocess2.Popen.assert_called_with([
  3479. 'vpython3',
  3480. 'PRESUBMIT_SUPPORT',
  3481. '--root',
  3482. 'root',
  3483. '--upstream',
  3484. 'upstream',
  3485. '--verbose',
  3486. '--verbose',
  3487. '--gerrit_url',
  3488. 'https://chromium-review.googlesource.com',
  3489. '--gerrit_project',
  3490. 'project',
  3491. '--gerrit_branch',
  3492. 'refs/heads/main',
  3493. '--author',
  3494. 'author',
  3495. '--issue',
  3496. '123456',
  3497. '--patchset',
  3498. '7',
  3499. '--post_upload',
  3500. '--description_file',
  3501. '/tmp/fake-temp1',
  3502. ])
  3503. gclient_utils.FileWrite.assert_called_once_with(
  3504. '/tmp/fake-temp1', 'description')
  3505. def testRunPostUploadHookPy3Only(self):
  3506. cl = git_cl.Changelist()
  3507. cl.RunPostUploadHook(2, 'upstream', 'description')
  3508. subprocess2.Popen.assert_called_once_with([
  3509. 'vpython3',
  3510. 'PRESUBMIT_SUPPORT',
  3511. '--root',
  3512. 'root',
  3513. '--upstream',
  3514. 'upstream',
  3515. '--verbose',
  3516. '--verbose',
  3517. '--gerrit_url',
  3518. 'https://chromium-review.googlesource.com',
  3519. '--gerrit_project',
  3520. 'project',
  3521. '--gerrit_branch',
  3522. 'refs/heads/main',
  3523. '--author',
  3524. 'author',
  3525. '--issue',
  3526. '123456',
  3527. '--patchset',
  3528. '7',
  3529. '--post_upload',
  3530. '--description_file',
  3531. '/tmp/fake-temp1',
  3532. ])
  3533. gclient_utils.FileWrite.assert_called_once_with('/tmp/fake-temp1',
  3534. 'description')
  3535. @mock.patch('git_cl.RunGit', _mock_run_git)
  3536. def testDefaultTitleEmptyMessage(self):
  3537. cl = git_cl.Changelist()
  3538. cl.issue = 100
  3539. options = optparse.Values({
  3540. 'squash': True,
  3541. 'title': None,
  3542. 'message': None,
  3543. 'force': None,
  3544. 'skip_title': None
  3545. })
  3546. mock.patch('gclient_utils.AskForData', lambda _: user_title).start()
  3547. for user_title in ['', 'y', 'Y']:
  3548. self.assertEqual(cl._GetTitleForUpload(options), self.LAST_COMMIT_SUBJECT)
  3549. for user_title in ['not empty', 'yes', 'YES']:
  3550. self.assertEqual(cl._GetTitleForUpload(options), user_title)
  3551. @mock.patch('git_cl.Changelist.GetMostRecentPatchset', return_value=2)
  3552. @mock.patch('git_cl.RunGit')
  3553. @mock.patch('git_cl.Changelist._PrepareChange')
  3554. def testPrepareSquashedCommit(self, mockPrepareChange, mockRunGit, *_mocks):
  3555. change_desc = git_cl.ChangeDescription('BOO!')
  3556. reviewers = []
  3557. ccs = []
  3558. mockPrepareChange.return_value = (reviewers, ccs, change_desc)
  3559. parent_hash = 'upstream-gerrit-hash'
  3560. parent_orig_hash = 'upstream-last-upload-hash'
  3561. parent_hash_root = 'root-commit'
  3562. hash_to_push = 'new-squash-hash'
  3563. hash_to_push_root = 'new-squash-hash-root'
  3564. branchref = 'refs/heads/current-branch'
  3565. end_hash = 'end-hash'
  3566. tree_hash = 'tree-hash'
  3567. def mock_run_git(commands):
  3568. if {'commit-tree', tree_hash, '-p', parent_hash,
  3569. '-F'}.issubset(set(commands)):
  3570. return hash_to_push
  3571. if {'commit-tree', tree_hash, '-p', parent_hash_root,
  3572. '-F'}.issubset(set(commands)):
  3573. return hash_to_push_root
  3574. if commands == ['rev-parse', branchref]:
  3575. return end_hash
  3576. if commands == ['rev-parse', end_hash + ':']:
  3577. return tree_hash
  3578. mockRunGit.side_effect = mock_run_git
  3579. cl = git_cl.Changelist(branchref=branchref)
  3580. options = optparse.Values()
  3581. new_upload = cl.PrepareSquashedCommit(options, parent_hash,
  3582. parent_orig_hash)
  3583. self.assertEqual(new_upload.reviewers, reviewers)
  3584. self.assertEqual(new_upload.ccs, ccs)
  3585. self.assertEqual(new_upload.commit_to_push, hash_to_push)
  3586. self.assertEqual(new_upload.new_last_uploaded_commit, end_hash)
  3587. self.assertEqual(new_upload.change_desc, change_desc)
  3588. mockPrepareChange.assert_called_with(options, parent_orig_hash, end_hash)
  3589. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  3590. @mock.patch('git_cl.Changelist.GetMostRecentPatchset', return_value=2)
  3591. @mock.patch('git_cl.RunGitWithCode')
  3592. @mock.patch('git_cl.RunGit')
  3593. @mock.patch('git_cl.Changelist._PrepareChange')
  3594. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  3595. def testPrepareCherryPickSquashedCommit(self,
  3596. mockGetCommonAncestorWithUpstream,
  3597. mockPrepareChange, mockRunGit,
  3598. mockRunGitWithCode, *_mocks):
  3599. cherry_pick_base_hash = '1a2bcherrypickbase'
  3600. mockGetCommonAncestorWithUpstream.return_value = cherry_pick_base_hash
  3601. change_desc = git_cl.ChangeDescription('BOO!')
  3602. ccs = ['cc@review.cl']
  3603. reviewers = ['reviewer@review.cl']
  3604. mockPrepareChange.return_value = (reviewers, ccs, change_desc)
  3605. branchref = 'refs/heads/current-branch'
  3606. cl = git_cl.Changelist(branchref=branchref)
  3607. options = optparse.Values()
  3608. upstream_gerrit_hash = 'upstream-gerrit-hash'
  3609. latest_tree_hash = 'tree-hash'
  3610. hash_to_cp = 'squashed-hash'
  3611. hash_to_push = 'hash-to-push'
  3612. hash_to_save_as_last_upload = 'last-upload'
  3613. def mock_run_git(commands):
  3614. if commands == ['rev-parse', branchref]:
  3615. return hash_to_save_as_last_upload
  3616. if commands == ['rev-parse', branchref + ':']:
  3617. return latest_tree_hash
  3618. if {'commit-tree', latest_tree_hash, '-p', cherry_pick_base_hash,
  3619. '-F'}.issubset(set(commands)):
  3620. return hash_to_cp
  3621. if commands == ['rev-parse', 'HEAD']:
  3622. return hash_to_push
  3623. mockRunGit.side_effect = mock_run_git
  3624. def mock_run_git_with_code(commands):
  3625. if commands == ['cherry-pick', hash_to_cp]:
  3626. return 0, ''
  3627. mockRunGitWithCode.side_effect = mock_run_git_with_code
  3628. new_upload = cl.PrepareCherryPickSquashedCommit(options,
  3629. upstream_gerrit_hash)
  3630. self.assertEqual(new_upload.reviewers, reviewers)
  3631. self.assertEqual(new_upload.ccs, ccs)
  3632. self.assertEqual(new_upload.commit_to_push, hash_to_push)
  3633. self.assertEqual(new_upload.new_last_uploaded_commit,
  3634. hash_to_save_as_last_upload)
  3635. self.assertEqual(new_upload.change_desc, change_desc)
  3636. # Test failed cherry-pick
  3637. def mock_run_git_with_code(commands):
  3638. if commands == ['cherry-pick', hash_to_cp]:
  3639. return 1, ''
  3640. mockRunGitWithCode.side_effect = mock_run_git_with_code
  3641. with self.assertRaises(SystemExitMock):
  3642. cl.PrepareCherryPickSquashedCommit(options, cherry_pick_base_hash)
  3643. @mock.patch('git_cl.Settings.GetDefaultCCList', return_value=[])
  3644. @mock.patch('git_cl.Changelist.GetAffectedFiles', return_value=[])
  3645. @mock.patch('git_cl.GenerateGerritChangeId', return_value='1a2b3c')
  3646. @mock.patch('git_cl.Changelist.GetIssue', return_value=None)
  3647. @mock.patch('git_cl.ChangeDescription.prompt')
  3648. @mock.patch('git_cl.Changelist.RunHook')
  3649. @mock.patch('git_cl.Changelist._GetDescriptionForUpload')
  3650. @mock.patch('git_cl.Changelist.EnsureCanUploadPatchset')
  3651. def testPrepareChange_new(self, mockEnsureCanUploadPatchset,
  3652. mockGetDescriptionForupload, mockRunHook,
  3653. mockPrompt, *_mocks):
  3654. options = optparse.Values()
  3655. options.force = False
  3656. options.bypass_hooks = False
  3657. options.verbose = False
  3658. options.parallel = False
  3659. options.preserve_tryjobs = False
  3660. options.private = False
  3661. options.no_autocc = False
  3662. options.message_file = None
  3663. options.cc = ['chicken@bok.farm']
  3664. parent = '420parent'
  3665. latest_tree = '420latest_tree'
  3666. mockRunHook.return_value = {'more_cc': ['cow@moo.farm']}
  3667. desc = 'AH!\nCC=cow2@moo.farm\nR=horse@apple.farm'
  3668. mockGetDescriptionForupload.return_value = git_cl.ChangeDescription(desc)
  3669. cl = git_cl.Changelist()
  3670. reviewers, ccs, change_desc = cl._PrepareChange(options, parent,
  3671. latest_tree)
  3672. self.assertEqual(reviewers, ['horse@apple.farm'])
  3673. self.assertEqual(ccs, ['cow@moo.farm', 'chicken@bok.farm', 'cow2@moo.farm'])
  3674. self.assertEqual(change_desc._description_lines, [
  3675. 'AH!', 'CC=cow2@moo.farm', 'R=horse@apple.farm', '', 'Change-Id: 1a2b3c'
  3676. ])
  3677. mockPrompt.assert_called_once()
  3678. mockEnsureCanUploadPatchset.assert_called_once()
  3679. mockRunHook.assert_called_once_with(committing=False,
  3680. may_prompt=True,
  3681. verbose=False,
  3682. parallel=False,
  3683. upstream='420parent',
  3684. description=desc,
  3685. all_files=False)
  3686. @mock.patch('git_cl.Changelist.GetAffectedFiles', return_value=[])
  3687. @mock.patch('git_cl.Changelist.GetIssue', return_value='123')
  3688. @mock.patch('git_cl.ChangeDescription.prompt')
  3689. @mock.patch('gerrit_util.GetChangeDetail')
  3690. @mock.patch('git_cl.Changelist.RunHook')
  3691. @mock.patch('git_cl.Changelist._GetDescriptionForUpload')
  3692. @mock.patch('git_cl.Changelist.EnsureCanUploadPatchset')
  3693. def testPrepareChange_existing(self, mockEnsureCanUploadPatchset,
  3694. mockGetDescriptionForupload, mockRunHook,
  3695. mockGetChangeDetail, mockPrompt, *_mocks):
  3696. cl = git_cl.Changelist()
  3697. options = optparse.Values()
  3698. options.force = False
  3699. options.bypass_hooks = False
  3700. options.verbose = False
  3701. options.parallel = False
  3702. options.edit_description = False
  3703. options.preserve_tryjobs = False
  3704. options.private = False
  3705. options.no_autocc = False
  3706. options.cc = ['chicken@bok.farm']
  3707. parent = '420parent'
  3708. latest_tree = '420latest_tree'
  3709. mockRunHook.return_value = {'more_cc': ['cow@moo.farm']}
  3710. desc = 'AH!\nCC=cow2@moo.farm\nR=horse@apple.farm'
  3711. mockGetDescriptionForupload.return_value = git_cl.ChangeDescription(desc)
  3712. # Existing change
  3713. gerrit_util.GetChangeDetail.return_value = {
  3714. 'change_id': ('123456789'),
  3715. 'current_revision': 'sha1_of_current_revision',
  3716. }
  3717. reviewers, ccs, change_desc = cl._PrepareChange(options, parent,
  3718. latest_tree)
  3719. self.assertEqual(reviewers, ['horse@apple.farm'])
  3720. self.assertEqual(ccs, ['chicken@bok.farm', 'cow2@moo.farm'])
  3721. self.assertEqual(change_desc._description_lines, [
  3722. 'AH!', 'CC=cow2@moo.farm', 'R=horse@apple.farm', '',
  3723. 'Change-Id: 123456789'
  3724. ])
  3725. mockRunHook.assert_called_once_with(committing=False,
  3726. may_prompt=True,
  3727. verbose=False,
  3728. parallel=False,
  3729. upstream='420parent',
  3730. description=desc,
  3731. all_files=False)
  3732. mockEnsureCanUploadPatchset.assert_called_once()
  3733. # Test preserve_tryjob
  3734. options.preserve_tryjobs = True
  3735. # Test edit_description
  3736. options.edit_description = True
  3737. # Test private
  3738. options.private = True
  3739. options.no_autocc = True
  3740. reviewers, ccs, change_desc = cl._PrepareChange(options, parent,
  3741. latest_tree)
  3742. self.assertEqual(ccs, ['chicken@bok.farm', 'cow2@moo.farm'])
  3743. mockPrompt.assert_called_once()
  3744. self.assertEqual(change_desc._description_lines, [
  3745. 'AH!', 'CC=cow2@moo.farm', 'R=horse@apple.farm', '',
  3746. 'Change-Id: 123456789', 'Cq-Do-Not-Cancel-Tryjobs: true'
  3747. ])
  3748. @mock.patch('git_cl.Changelist.GetGerritHost', return_value='chromium')
  3749. @mock.patch('git_cl.Settings.GetRunPostUploadHook', return_value=True)
  3750. @mock.patch('git_cl.Changelist.SetPatchset')
  3751. @mock.patch('git_cl.Changelist.RunPostUploadHook')
  3752. @mock.patch('git_cl.gerrit_util.AddReviewers')
  3753. def testPostUploadUpdates(self, mockAddReviewers, mockRunPostHook,
  3754. mockSetPatchset, *_mocks):
  3755. cl = git_cl.Changelist(branchref='refs/heads/current-branch')
  3756. options = optparse.Values()
  3757. options.verbose = True
  3758. options.no_python2_post_upload_hooks = True
  3759. options.send_mail = False
  3760. reviewers = ['monkey@vp.circus']
  3761. ccs = ['cow@rds.corp']
  3762. change_desc = git_cl.ChangeDescription('[stonks] honk honk')
  3763. new_upload = git_cl._NewUpload(reviewers, ccs, 'pushed-commit',
  3764. 'last-uploaded-commit', 'parent-commit',
  3765. change_desc, 2)
  3766. cl.PostUploadUpdates(options, new_upload, '12345')
  3767. mockSetPatchset.assert_called_once_with(3)
  3768. self.assertEqual(
  3769. self.mockGit.config['root:branch.current-branch.gerritsquashhash'],
  3770. new_upload.commit_to_push)
  3771. self.assertEqual(
  3772. self.mockGit.config['root:branch.current-branch.last-upload-hash'],
  3773. new_upload.new_last_uploaded_commit)
  3774. mockAddReviewers.assert_called_once_with('chromium',
  3775. 'project~123456',
  3776. reviewers=reviewers,
  3777. ccs=ccs,
  3778. notify=False)
  3779. mockRunPostHook.assert_called_once_with(True, 'parent-commit',
  3780. change_desc.description)
  3781. class CMDTestCaseBase(unittest.TestCase):
  3782. _STATUSES = [
  3783. 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
  3784. 'INFRA_FAILURE', 'CANCELED',
  3785. ]
  3786. _CHANGE_DETAIL = {
  3787. 'project': 'depot_tools',
  3788. 'status': 'OPEN',
  3789. 'owner': {'email': 'owner@e.mail'},
  3790. 'current_revision': 'beeeeeef',
  3791. 'revisions': {
  3792. 'deadbeaf': {
  3793. '_number': 6,
  3794. 'kind': 'REWORK',
  3795. },
  3796. 'beeeeeef': {
  3797. '_number': 7,
  3798. 'kind': 'NO_CODE_CHANGE',
  3799. 'fetch': {'http': {
  3800. 'url': 'https://chromium.googlesource.com/depot_tools',
  3801. 'ref': 'refs/changes/56/123456/7'
  3802. }},
  3803. },
  3804. },
  3805. }
  3806. _DEFAULT_RESPONSE = {
  3807. 'builds': [{
  3808. 'id': str(100 + idx),
  3809. 'builder': {
  3810. 'project': 'chromium',
  3811. 'bucket': 'try',
  3812. 'builder': 'bot_' + status.lower(),
  3813. },
  3814. 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
  3815. 'tags': [],
  3816. 'status': status,
  3817. } for idx, status in enumerate(_STATUSES)]
  3818. }
  3819. def setUp(self):
  3820. super(CMDTestCaseBase, self).setUp()
  3821. mock.patch('git_cl.sys.stdout', StringIO()).start()
  3822. mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
  3823. mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
  3824. mock.patch(
  3825. 'git_cl.Changelist.GetCodereviewServer',
  3826. return_value='https://chromium-review.googlesource.com').start()
  3827. mock.patch(
  3828. 'git_cl.Changelist.GetGerritHost',
  3829. return_value='chromium-review.googlesource.com').start()
  3830. mock.patch(
  3831. 'git_cl.Changelist.GetMostRecentPatchset',
  3832. return_value=7).start()
  3833. mock.patch(
  3834. 'git_cl.Changelist.GetMostRecentDryRunPatchset',
  3835. return_value=6).start()
  3836. mock.patch(
  3837. 'git_cl.Changelist.GetRemoteUrl',
  3838. return_value='https://chromium.googlesource.com/depot_tools').start()
  3839. mock.patch(
  3840. 'auth.Authenticator',
  3841. return_value=AuthenticatorMock()).start()
  3842. mock.patch(
  3843. 'gerrit_util.GetChangeDetail',
  3844. return_value=self._CHANGE_DETAIL).start()
  3845. mock.patch(
  3846. 'git_cl._call_buildbucket',
  3847. return_value = self._DEFAULT_RESPONSE).start()
  3848. mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
  3849. self.addCleanup(mock.patch.stopall)
  3850. class CMDPresubmitTestCase(CMDTestCaseBase):
  3851. def setUp(self):
  3852. super(CMDPresubmitTestCase, self).setUp()
  3853. mock.patch(
  3854. 'git_cl.Changelist.GetCommonAncestorWithUpstream',
  3855. return_value='upstream').start()
  3856. mock.patch(
  3857. 'git_cl.Changelist.FetchDescription',
  3858. return_value='fetch description').start()
  3859. mock.patch(
  3860. 'git_cl._create_description_from_log',
  3861. return_value='get description').start()
  3862. mock.patch('git_cl.Changelist.RunHook').start()
  3863. def testDefaultCase(self):
  3864. self.assertEqual(0, git_cl.main(['presubmit']))
  3865. git_cl.Changelist.RunHook.assert_called_once_with(
  3866. committing=True,
  3867. may_prompt=False,
  3868. verbose=0,
  3869. parallel=None,
  3870. upstream='upstream',
  3871. description='fetch description',
  3872. all_files=None,
  3873. files=None,
  3874. resultdb=None,
  3875. realm=None)
  3876. def testNoIssue(self):
  3877. git_cl.Changelist.GetIssue.return_value = None
  3878. self.assertEqual(0, git_cl.main(['presubmit']))
  3879. git_cl.Changelist.RunHook.assert_called_once_with(
  3880. committing=True,
  3881. may_prompt=False,
  3882. verbose=0,
  3883. parallel=None,
  3884. upstream='upstream',
  3885. description='get description',
  3886. all_files=None,
  3887. files=None,
  3888. resultdb=None,
  3889. realm=None)
  3890. def testCustomBranch(self):
  3891. self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch']))
  3892. git_cl.Changelist.RunHook.assert_called_once_with(
  3893. committing=True,
  3894. may_prompt=False,
  3895. verbose=0,
  3896. parallel=None,
  3897. upstream='custom_branch',
  3898. description='fetch description',
  3899. all_files=None,
  3900. files=None,
  3901. resultdb=None,
  3902. realm=None)
  3903. def testOptions(self):
  3904. self.assertEqual(
  3905. 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u',
  3906. '--resultdb', '--realm', 'chromium:public']))
  3907. git_cl.Changelist.RunHook.assert_called_once_with(
  3908. committing=False,
  3909. may_prompt=False,
  3910. verbose=2,
  3911. parallel=True,
  3912. upstream='upstream',
  3913. description='fetch description',
  3914. all_files=True,
  3915. files=None,
  3916. resultdb=True,
  3917. realm='chromium:public')
  3918. class CMDTryResultsTestCase(CMDTestCaseBase):
  3919. _DEFAULT_REQUEST = {
  3920. 'predicate': {
  3921. "gerritChanges": [{
  3922. "project": "depot_tools",
  3923. "host": "chromium-review.googlesource.com",
  3924. "patchset": 6,
  3925. "change": 123456,
  3926. }],
  3927. },
  3928. 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
  3929. ',builds.*.createTime,builds.*.tags'),
  3930. }
  3931. _TRIVIAL_REQUEST = {
  3932. 'predicate': {
  3933. "gerritChanges": [{
  3934. "project": "depot_tools",
  3935. "host": "chromium-review.googlesource.com",
  3936. "patchset": 7,
  3937. "change": 123456,
  3938. }],
  3939. },
  3940. 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
  3941. ',builds.*.createTime,builds.*.tags'),
  3942. }
  3943. def testNoJobs(self):
  3944. git_cl._call_buildbucket.return_value = {}
  3945. self.assertEqual(0, git_cl.main(['try-results']))
  3946. self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
  3947. git_cl._call_buildbucket.assert_called_once_with(
  3948. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3949. self._DEFAULT_REQUEST)
  3950. def testTrivialCommits(self):
  3951. self.assertEqual(0, git_cl.main(['try-results']))
  3952. git_cl._call_buildbucket.assert_called_with(
  3953. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3954. self._DEFAULT_REQUEST)
  3955. git_cl._call_buildbucket.return_value = {}
  3956. self.assertEqual(0, git_cl.main(['try-results', '--patchset', '7']))
  3957. git_cl._call_buildbucket.assert_called_with(
  3958. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3959. self._TRIVIAL_REQUEST)
  3960. self.assertEqual([
  3961. 'Successes:',
  3962. ' bot_success https://ci.chromium.org/b/103',
  3963. 'Infra Failures:',
  3964. ' bot_infra_failure https://ci.chromium.org/b/105',
  3965. 'Failures:',
  3966. ' bot_failure https://ci.chromium.org/b/104',
  3967. 'Canceled:',
  3968. ' bot_canceled ',
  3969. 'Started:',
  3970. ' bot_started https://ci.chromium.org/b/102',
  3971. 'Scheduled:',
  3972. ' bot_scheduled id=101',
  3973. 'Other:',
  3974. ' bot_status_unspecified id=100',
  3975. 'Total: 7 tryjobs',
  3976. 'No tryjobs scheduled.',
  3977. ], sys.stdout.getvalue().splitlines())
  3978. def testPrintToStdout(self):
  3979. self.assertEqual(0, git_cl.main(['try-results']))
  3980. self.assertEqual([
  3981. 'Successes:',
  3982. ' bot_success https://ci.chromium.org/b/103',
  3983. 'Infra Failures:',
  3984. ' bot_infra_failure https://ci.chromium.org/b/105',
  3985. 'Failures:',
  3986. ' bot_failure https://ci.chromium.org/b/104',
  3987. 'Canceled:',
  3988. ' bot_canceled ',
  3989. 'Started:',
  3990. ' bot_started https://ci.chromium.org/b/102',
  3991. 'Scheduled:',
  3992. ' bot_scheduled id=101',
  3993. 'Other:',
  3994. ' bot_status_unspecified id=100',
  3995. 'Total: 7 tryjobs',
  3996. ], sys.stdout.getvalue().splitlines())
  3997. git_cl._call_buildbucket.assert_called_once_with(
  3998. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3999. self._DEFAULT_REQUEST)
  4000. def testPrintToStdoutWithMasters(self):
  4001. self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
  4002. self.assertEqual([
  4003. 'Successes:',
  4004. ' try bot_success https://ci.chromium.org/b/103',
  4005. 'Infra Failures:',
  4006. ' try bot_infra_failure https://ci.chromium.org/b/105',
  4007. 'Failures:',
  4008. ' try bot_failure https://ci.chromium.org/b/104',
  4009. 'Canceled:',
  4010. ' try bot_canceled ',
  4011. 'Started:',
  4012. ' try bot_started https://ci.chromium.org/b/102',
  4013. 'Scheduled:',
  4014. ' try bot_scheduled id=101',
  4015. 'Other:',
  4016. ' try bot_status_unspecified id=100',
  4017. 'Total: 7 tryjobs',
  4018. ], sys.stdout.getvalue().splitlines())
  4019. git_cl._call_buildbucket.assert_called_once_with(
  4020. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  4021. self._DEFAULT_REQUEST)
  4022. @mock.patch('git_cl.write_json')
  4023. def testWriteToJson(self, mockJsonDump):
  4024. self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
  4025. git_cl._call_buildbucket.assert_called_once_with(
  4026. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  4027. self._DEFAULT_REQUEST)
  4028. mockJsonDump.assert_called_once_with(
  4029. 'file.json', self._DEFAULT_RESPONSE['builds'])
  4030. def test_filter_failed_for_one_simple(self):
  4031. self.assertEqual([], git_cl._filter_failed_for_retry([]))
  4032. self.assertEqual(
  4033. [
  4034. ('chromium', 'try', 'bot_failure'),
  4035. ('chromium', 'try', 'bot_infra_failure'),
  4036. ],
  4037. git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
  4038. def test_filter_failed_for_retry_many_builds(self):
  4039. def _build(name, created_sec, status, experimental=False):
  4040. assert 0 <= created_sec < 100, created_sec
  4041. b = {
  4042. 'id': 112112,
  4043. 'builder': {
  4044. 'project': 'chromium',
  4045. 'bucket': 'try',
  4046. 'builder': name,
  4047. },
  4048. 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
  4049. 'status': status,
  4050. 'tags': [],
  4051. }
  4052. if experimental:
  4053. b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
  4054. return b
  4055. builds = [
  4056. _build('flaky-last-green', 1, 'FAILURE'),
  4057. _build('flaky-last-green', 2, 'SUCCESS'),
  4058. _build('flaky', 1, 'SUCCESS'),
  4059. _build('flaky', 2, 'FAILURE'),
  4060. _build('running', 1, 'FAILED'),
  4061. _build('running', 2, 'SCHEDULED'),
  4062. _build('yep-still-running', 1, 'STARTED'),
  4063. _build('yep-still-running', 2, 'FAILURE'),
  4064. _build('cq-experimental', 1, 'SUCCESS', experimental=True),
  4065. _build('cq-experimental', 2, 'FAILURE', experimental=True),
  4066. # Simulate experimental in CQ builder, which developer decided
  4067. # to retry manually which resulted in 2nd build non-experimental.
  4068. _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
  4069. _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
  4070. ]
  4071. builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
  4072. self.assertEqual(
  4073. [
  4074. ('chromium', 'try', 'flaky'),
  4075. ('chromium', 'try', 'sometimes-experimental'),
  4076. ],
  4077. git_cl._filter_failed_for_retry(builds))
  4078. class CMDTryTestCase(CMDTestCaseBase):
  4079. @mock.patch('git_cl.Changelist.SetCQState')
  4080. def testSetCQDryRunByDefault(self, mockSetCQState):
  4081. mockSetCQState.return_value = 0
  4082. self.assertEqual(0, git_cl.main(['try']))
  4083. git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
  4084. self.assertEqual(
  4085. sys.stdout.getvalue(),
  4086. 'Scheduling CQ dry run on: '
  4087. 'https://chromium-review.googlesource.com/123456\n')
  4088. @mock.patch('git_cl._call_buildbucket')
  4089. def testScheduleOnBuildbucket(self, mockCallBuildbucket):
  4090. mockCallBuildbucket.return_value = {}
  4091. self.assertEqual(0, git_cl.main([
  4092. 'try', '-B', 'luci.chromium.try', '-b', 'win',
  4093. '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
  4094. self.assertIn(
  4095. 'Scheduling jobs on:\n'
  4096. ' chromium/try: win',
  4097. git_cl.sys.stdout.getvalue())
  4098. expected_request = {
  4099. "requests": [{
  4100. "scheduleBuild": {
  4101. "requestId": "uuid4",
  4102. "builder": {
  4103. "project": "chromium",
  4104. "builder": "win",
  4105. "bucket": "try",
  4106. },
  4107. "gerritChanges": [{
  4108. "project": "depot_tools",
  4109. "host": "chromium-review.googlesource.com",
  4110. "patchset": 7,
  4111. "change": 123456,
  4112. }],
  4113. "properties": {
  4114. "category": "git_cl_try",
  4115. "json": [{"a": 1}, None],
  4116. "key": "val",
  4117. },
  4118. "tags": [
  4119. {"value": "win", "key": "builder"},
  4120. {"value": "git_cl_try", "key": "user_agent"},
  4121. ],
  4122. },
  4123. }],
  4124. }
  4125. mockCallBuildbucket.assert_called_with(
  4126. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  4127. @mock.patch('git_cl._call_buildbucket')
  4128. def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
  4129. mockCallBuildbucket.return_value = {}
  4130. mock.patch('git_cl.Changelist.GetRemoteBranch',
  4131. return_value=('origin', 'refs/remotes/origin/main')).start()
  4132. self.assertEqual(0, git_cl.main([
  4133. 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
  4134. '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
  4135. '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
  4136. self.assertIn(
  4137. 'Scheduling jobs on:\n'
  4138. ' chromium/try: linux\n'
  4139. ' chromium/try: win',
  4140. git_cl.sys.stdout.getvalue())
  4141. expected_request = {
  4142. "requests": [{
  4143. "scheduleBuild": {
  4144. "requestId":
  4145. "uuid4",
  4146. "builder": {
  4147. "project": "chromium",
  4148. "builder": "linux",
  4149. "bucket": "try",
  4150. },
  4151. "gerritChanges": [{
  4152. "project": "depot_tools",
  4153. "host": "chromium-review.googlesource.com",
  4154. "patchset": 7,
  4155. "change": 123456,
  4156. }],
  4157. "properties": {
  4158. "category": "git_cl_try",
  4159. "json": [{
  4160. "a": 1
  4161. }, None],
  4162. "key": "val",
  4163. },
  4164. "tags": [
  4165. {
  4166. "value": "linux",
  4167. "key": "builder"
  4168. },
  4169. {
  4170. "value": "git_cl_try",
  4171. "key": "user_agent"
  4172. },
  4173. ],
  4174. "gitilesCommit": {
  4175. "host": "chromium.googlesource.com",
  4176. "project": "depot_tools",
  4177. "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
  4178. "ref": "refs/heads/main",
  4179. }
  4180. },
  4181. }, {
  4182. "scheduleBuild": {
  4183. "requestId":
  4184. "uuid4",
  4185. "builder": {
  4186. "project": "chromium",
  4187. "builder": "win",
  4188. "bucket": "try",
  4189. },
  4190. "gerritChanges": [{
  4191. "project": "depot_tools",
  4192. "host": "chromium-review.googlesource.com",
  4193. "patchset": 7,
  4194. "change": 123456,
  4195. }],
  4196. "properties": {
  4197. "category": "git_cl_try",
  4198. "json": [{
  4199. "a": 1
  4200. }, None],
  4201. "key": "val",
  4202. },
  4203. "tags": [
  4204. {
  4205. "value": "win",
  4206. "key": "builder"
  4207. },
  4208. {
  4209. "value": "git_cl_try",
  4210. "key": "user_agent"
  4211. },
  4212. ],
  4213. "gitilesCommit": {
  4214. "host": "chromium.googlesource.com",
  4215. "project": "depot_tools",
  4216. "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
  4217. "ref": "refs/heads/main",
  4218. }
  4219. },
  4220. }],
  4221. }
  4222. mockCallBuildbucket.assert_called_with(
  4223. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  4224. @mock.patch('sys.stderr', StringIO())
  4225. def testScheduleOnBuildbucket_WrongBucket(self):
  4226. with self.assertRaises(SystemExit):
  4227. git_cl.main([
  4228. 'try', '-B', 'not-a-bucket', '-b', 'win',
  4229. '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
  4230. self.assertIn(
  4231. 'Invalid bucket: not-a-bucket.',
  4232. sys.stderr.getvalue())
  4233. @mock.patch('git_cl._call_buildbucket')
  4234. @mock.patch('git_cl._fetch_tryjobs')
  4235. def testScheduleOnBuildbucketRetryFailed(
  4236. self, mockFetchTryJobs, mockCallBuildbucket):
  4237. git_cl._fetch_tryjobs.side_effect = lambda *_, **kw: {
  4238. 7: [],
  4239. 6: [{
  4240. 'id': 112112,
  4241. 'builder': {
  4242. 'project': 'chromium',
  4243. 'bucket': 'try',
  4244. 'builder': 'linux', },
  4245. 'createTime': '2019-10-09T08:00:01.854286Z',
  4246. 'tags': [],
  4247. 'status': 'FAILURE', }], }[kw['patchset']]
  4248. mockCallBuildbucket.return_value = {}
  4249. self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
  4250. self.assertIn(
  4251. 'Scheduling jobs on:\n'
  4252. ' chromium/try: linux',
  4253. git_cl.sys.stdout.getvalue())
  4254. expected_request = {
  4255. "requests": [{
  4256. "scheduleBuild": {
  4257. "requestId": "uuid4",
  4258. "builder": {
  4259. "project": "chromium",
  4260. "bucket": "try",
  4261. "builder": "linux",
  4262. },
  4263. "gerritChanges": [{
  4264. "project": "depot_tools",
  4265. "host": "chromium-review.googlesource.com",
  4266. "patchset": 7,
  4267. "change": 123456,
  4268. }],
  4269. "properties": {
  4270. "category": "git_cl_try",
  4271. },
  4272. "tags": [
  4273. {"value": "linux", "key": "builder"},
  4274. {"value": "git_cl_try", "key": "user_agent"},
  4275. {"value": "1", "key": "retry_failed"},
  4276. ],
  4277. },
  4278. }],
  4279. }
  4280. mockCallBuildbucket.assert_called_with(
  4281. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  4282. def test_parse_bucket(self):
  4283. test_cases = [
  4284. {
  4285. 'bucket': 'chromium/try',
  4286. 'result': ('chromium', 'try'),
  4287. },
  4288. {
  4289. 'bucket': 'luci.chromium.try',
  4290. 'result': ('chromium', 'try'),
  4291. 'has_warning': True,
  4292. },
  4293. {
  4294. 'bucket': 'skia.primary',
  4295. 'result': ('skia', 'skia.primary'),
  4296. 'has_warning': True,
  4297. },
  4298. {
  4299. 'bucket': 'not-a-bucket',
  4300. 'result': (None, None),
  4301. },
  4302. ]
  4303. for test_case in test_cases:
  4304. git_cl.sys.stdout.truncate(0)
  4305. self.assertEqual(
  4306. test_case['result'], git_cl._parse_bucket(test_case['bucket']))
  4307. if test_case.get('has_warning'):
  4308. expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
  4309. test_case['result'])
  4310. self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
  4311. class CMDUploadTestCase(CMDTestCaseBase):
  4312. def setUp(self):
  4313. super(CMDUploadTestCase, self).setUp()
  4314. mock.patch('git_cl._fetch_tryjobs').start()
  4315. mock.patch('git_cl._trigger_tryjobs', return_value={}).start()
  4316. mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
  4317. mock.patch('git_cl.Settings.GetRoot', return_value='').start()
  4318. mock.patch(
  4319. 'git_cl.Settings.GetSquashGerritUploads',
  4320. return_value=True).start()
  4321. mock.patch.dict(os.environ, {
  4322. git_cl.DOGFOOD_STACKED_CHANGES_VAR: "0"
  4323. }).start()
  4324. self.addCleanup(mock.patch.stopall)
  4325. def testWarmUpChangeDetailCache(self):
  4326. self.assertEqual(0, git_cl.main(['upload']))
  4327. gerrit_util.GetChangeDetail.assert_called_once_with(
  4328. 'chromium-review.googlesource.com', 'depot_tools~123456',
  4329. frozenset([
  4330. 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
  4331. 'CURRENT_COMMIT']))
  4332. def testUploadRetryFailed(self):
  4333. # This test mocks out the actual upload part, and just asserts that after
  4334. # upload, if --retry-failed is added, then the tool will fetch try jobs
  4335. # from the previous patchset and trigger the right builders on the latest
  4336. # patchset.
  4337. git_cl._fetch_tryjobs.side_effect = [
  4338. # Latest patchset: No builds.
  4339. [],
  4340. # Patchset before latest: Some builds.
  4341. [{
  4342. 'id': str(100 + idx),
  4343. 'builder': {
  4344. 'project': 'chromium',
  4345. 'bucket': 'try',
  4346. 'builder': 'bot_' + status.lower(),
  4347. },
  4348. 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
  4349. 'tags': [],
  4350. 'status': status,
  4351. } for idx, status in enumerate(self._STATUSES)],
  4352. ]
  4353. self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
  4354. self.assertEqual([
  4355. mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
  4356. mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
  4357. ], git_cl._fetch_tryjobs.mock_calls)
  4358. expected_buckets = [
  4359. ('chromium', 'try', 'bot_failure'),
  4360. ('chromium', 'try', 'bot_infra_failure'),
  4361. ]
  4362. git_cl._trigger_tryjobs.assert_called_once_with(mock.ANY, expected_buckets,
  4363. mock.ANY, 8)
  4364. class MakeRequestsHelperTestCase(unittest.TestCase):
  4365. def exampleGerritChange(self):
  4366. return {
  4367. 'host': 'chromium-review.googlesource.com',
  4368. 'project': 'depot_tools',
  4369. 'change': 1,
  4370. 'patchset': 2,
  4371. }
  4372. def testMakeRequestsHelperNoOptions(self):
  4373. # Basic test for the helper function _make_tryjob_schedule_requests;
  4374. # it shouldn't throw AttributeError even when options doesn't have any
  4375. # of the expected values; it will use default option values.
  4376. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4377. jobs = [('chromium', 'try', 'my-builder')]
  4378. options = optparse.Values()
  4379. requests = git_cl._make_tryjob_schedule_requests(
  4380. changelist, jobs, options, patchset=None)
  4381. # requestId is non-deterministic. Just assert that it's there and has
  4382. # a particular length.
  4383. self.assertEqual(len(requests[0]['scheduleBuild'].pop('requestId')), 36)
  4384. self.assertEqual(requests, [{
  4385. 'scheduleBuild': {
  4386. 'builder': {
  4387. 'bucket': 'try',
  4388. 'builder': 'my-builder',
  4389. 'project': 'chromium'
  4390. },
  4391. 'gerritChanges': [self.exampleGerritChange()],
  4392. 'properties': {
  4393. 'category': 'git_cl_try'
  4394. },
  4395. 'tags': [{
  4396. 'key': 'builder',
  4397. 'value': 'my-builder'
  4398. }, {
  4399. 'key': 'user_agent',
  4400. 'value': 'git_cl_try'
  4401. }]
  4402. }
  4403. }])
  4404. def testMakeRequestsHelperPresubmitSetsDryRunProperty(self):
  4405. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4406. jobs = [('chromium', 'try', 'presubmit')]
  4407. options = optparse.Values()
  4408. requests = git_cl._make_tryjob_schedule_requests(
  4409. changelist, jobs, options, patchset=None)
  4410. self.assertEqual(requests[0]['scheduleBuild']['properties'], {
  4411. 'category': 'git_cl_try',
  4412. 'dry_run': 'true'
  4413. })
  4414. def testMakeRequestsHelperRevisionSet(self):
  4415. # Gitiles commit is specified when revision is in options.
  4416. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4417. jobs = [('chromium', 'try', 'my-builder')]
  4418. options = optparse.Values({'revision': 'ba5eba11'})
  4419. requests = git_cl._make_tryjob_schedule_requests(
  4420. changelist, jobs, options, patchset=None)
  4421. self.assertEqual(
  4422. requests[0]['scheduleBuild']['gitilesCommit'], {
  4423. 'host': 'chromium.googlesource.com',
  4424. 'id': 'ba5eba11',
  4425. 'project': 'depot_tools',
  4426. 'ref': 'refs/heads/main',
  4427. })
  4428. def testMakeRequestsHelperRetryFailedSet(self):
  4429. # An extra tag is added when retry_failed is in options.
  4430. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4431. jobs = [('chromium', 'try', 'my-builder')]
  4432. options = optparse.Values({'retry_failed': 'true'})
  4433. requests = git_cl._make_tryjob_schedule_requests(
  4434. changelist, jobs, options, patchset=None)
  4435. self.assertEqual(
  4436. requests[0]['scheduleBuild']['tags'], [
  4437. {
  4438. 'key': 'builder',
  4439. 'value': 'my-builder'
  4440. },
  4441. {
  4442. 'key': 'user_agent',
  4443. 'value': 'git_cl_try'
  4444. },
  4445. {
  4446. 'key': 'retry_failed',
  4447. 'value': '1'
  4448. }
  4449. ])
  4450. def testMakeRequestsHelperCategorySet(self):
  4451. # The category property can be overridden with options.
  4452. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4453. jobs = [('chromium', 'try', 'my-builder')]
  4454. options = optparse.Values({'category': 'my-special-category'})
  4455. requests = git_cl._make_tryjob_schedule_requests(
  4456. changelist, jobs, options, patchset=None)
  4457. self.assertEqual(requests[0]['scheduleBuild']['properties'],
  4458. {'category': 'my-special-category'})
  4459. class CMDFormatTestCase(unittest.TestCase):
  4460. def setUp(self):
  4461. super(CMDFormatTestCase, self).setUp()
  4462. mock.patch('git_cl.RunCommand').start()
  4463. mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
  4464. mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
  4465. mock.patch('git_cl.settings').start()
  4466. self._top_dir = tempfile.mkdtemp()
  4467. self.addCleanup(mock.patch.stopall)
  4468. def tearDown(self):
  4469. shutil.rmtree(self._top_dir)
  4470. super(CMDFormatTestCase, self).tearDown()
  4471. def _make_temp_file(self, fname, contents):
  4472. gclient_utils.FileWrite(os.path.join(self._top_dir, fname),
  4473. ('\n'.join(contents)))
  4474. def _make_yapfignore(self, contents):
  4475. self._make_temp_file('.yapfignore', contents)
  4476. def _check_yapf_filtering(self, files, expected):
  4477. self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
  4478. files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
  4479. def _run_command_mock(self, return_value):
  4480. def f(*args, **kwargs):
  4481. if 'stdin' in kwargs:
  4482. self.assertIsInstance(kwargs['stdin'], bytes)
  4483. return return_value
  4484. return f
  4485. def testClangFormatDiffFull(self):
  4486. self._make_temp_file('test.cc', ['// test'])
  4487. git_cl.settings.GetFormatFullByDefault.return_value = False
  4488. diff_file = [os.path.join(self._top_dir, 'test.cc')]
  4489. mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
  4490. # Diff
  4491. git_cl.RunCommand.side_effect = self._run_command_mock(' // test')
  4492. return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
  4493. self._top_dir, 'HEAD')
  4494. self.assertEqual(2, return_value)
  4495. # No diff
  4496. git_cl.RunCommand.side_effect = self._run_command_mock('// test')
  4497. return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
  4498. self._top_dir, 'HEAD')
  4499. self.assertEqual(0, return_value)
  4500. def testClangFormatDiff(self):
  4501. git_cl.settings.GetFormatFullByDefault.return_value = False
  4502. # A valid file is required, so use this test.
  4503. clang_format.FindClangFormatToolInChromiumTree.return_value = __file__
  4504. mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
  4505. # Diff
  4506. git_cl.RunCommand.side_effect = self._run_command_mock('error')
  4507. return_value = git_cl._RunClangFormatDiff(
  4508. mock_opts, ['.'], self._top_dir, 'HEAD')
  4509. self.assertEqual(2, return_value)
  4510. # No diff
  4511. git_cl.RunCommand.side_effect = self._run_command_mock('')
  4512. return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
  4513. 'HEAD')
  4514. self.assertEqual(0, return_value)
  4515. def testYapfignoreExplicit(self):
  4516. self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
  4517. files = [
  4518. 'bar.py',
  4519. 'foo/bar.py',
  4520. 'foo/baz.py',
  4521. 'foo/bar/baz.py',
  4522. 'foo/bar/foobar.py',
  4523. ]
  4524. expected = [
  4525. 'bar.py',
  4526. 'foo/baz.py',
  4527. 'foo/bar/foobar.py',
  4528. ]
  4529. self._check_yapf_filtering(files, expected)
  4530. def testYapfignoreSingleWildcards(self):
  4531. self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
  4532. files = [
  4533. 'bar.py', # Matched by *bar.py.
  4534. 'bar.txt',
  4535. 'foobar.py', # Matched by *bar.py, foo*.
  4536. 'foobar.txt', # Matched by foo*.
  4537. 'bazbar.py', # Matched by *bar.py, baz*.py.
  4538. 'bazbar.txt',
  4539. 'foo/baz.txt', # Matched by foo*.
  4540. 'bar/bar.py', # Matched by *bar.py.
  4541. 'baz/foo.py', # Matched by baz*.py, foo*.
  4542. 'baz/foo.txt',
  4543. ]
  4544. expected = [
  4545. 'bar.txt',
  4546. 'bazbar.txt',
  4547. 'baz/foo.txt',
  4548. ]
  4549. self._check_yapf_filtering(files, expected)
  4550. def testYapfignoreMultiplewildcards(self):
  4551. self._make_yapfignore(['*bar*', '*foo*baz.txt'])
  4552. files = [
  4553. 'bar.py', # Matched by *bar*.
  4554. 'bar.txt', # Matched by *bar*.
  4555. 'abar.py', # Matched by *bar*.
  4556. 'foobaz.txt', # Matched by *foo*baz.txt.
  4557. 'foobaz.py',
  4558. 'afoobaz.txt', # Matched by *foo*baz.txt.
  4559. ]
  4560. expected = [
  4561. 'foobaz.py',
  4562. ]
  4563. self._check_yapf_filtering(files, expected)
  4564. def testYapfignoreComments(self):
  4565. self._make_yapfignore(['test.py', '#test2.py'])
  4566. files = [
  4567. 'test.py',
  4568. 'test2.py',
  4569. ]
  4570. expected = [
  4571. 'test2.py',
  4572. ]
  4573. self._check_yapf_filtering(files, expected)
  4574. def testYapfHandleUtf8(self):
  4575. self._make_yapfignore(['test.py', 'test_🌐.py'])
  4576. files = [
  4577. 'test.py',
  4578. 'test_🌐.py',
  4579. 'test2.py',
  4580. ]
  4581. expected = [
  4582. 'test2.py',
  4583. ]
  4584. self._check_yapf_filtering(files, expected)
  4585. def testYapfignoreBlankLines(self):
  4586. self._make_yapfignore(['test.py', '', '', 'test2.py'])
  4587. files = [
  4588. 'test.py',
  4589. 'test2.py',
  4590. 'test3.py',
  4591. ]
  4592. expected = [
  4593. 'test3.py',
  4594. ]
  4595. self._check_yapf_filtering(files, expected)
  4596. def testYapfignoreWhitespace(self):
  4597. self._make_yapfignore([' test.py '])
  4598. files = [
  4599. 'test.py',
  4600. 'test2.py',
  4601. ]
  4602. expected = [
  4603. 'test2.py',
  4604. ]
  4605. self._check_yapf_filtering(files, expected)
  4606. def testYapfignoreNoFiles(self):
  4607. self._make_yapfignore(['test.py'])
  4608. self._check_yapf_filtering([], [])
  4609. def testYapfignoreMissingYapfignore(self):
  4610. files = [
  4611. 'test.py',
  4612. ]
  4613. expected = [
  4614. 'test.py',
  4615. ]
  4616. self._check_yapf_filtering(files, expected)
  4617. class CMDStatusTestCase(CMDTestCaseBase):
  4618. # Return branch names a,..,f with comitterdates in increasing order, i.e.
  4619. # 'f' is the most-recently changed branch.
  4620. def _mock_run_git(commands):
  4621. if commands == [
  4622. 'for-each-ref', '--format=%(refname) %(committerdate:unix)',
  4623. 'refs/heads'
  4624. ]:
  4625. branches_and_committerdates = [
  4626. 'refs/heads/a 1',
  4627. 'refs/heads/b 2',
  4628. 'refs/heads/c 3',
  4629. 'refs/heads/d 4',
  4630. 'refs/heads/e 5',
  4631. 'refs/heads/f 6',
  4632. ]
  4633. return '\n'.join(branches_and_committerdates)
  4634. # Mock the status in such a way that the issue number gives us an
  4635. # indication of the commit date (simplifies manual debugging).
  4636. def _mock_get_cl_statuses(branches, fine_grained, max_processes):
  4637. for c in branches:
  4638. c.issue = (100 + int(c.GetCommitDate()))
  4639. yield (c, 'open')
  4640. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  4641. @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
  4642. @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
  4643. @mock.patch('git_cl.RunGit', _mock_run_git)
  4644. @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
  4645. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  4646. @mock.patch('git_cl.Settings.IsStatusCommitOrderByDate', return_value=False)
  4647. @mock.patch('scm.GIT.GetBranch', return_value='a')
  4648. def testStatus(self, *_mocks):
  4649. self.assertEqual(0, git_cl.main(['status', '--no-branch-color']))
  4650. self.maxDiff = None
  4651. self.assertEqual(
  4652. sys.stdout.getvalue(), 'Branches associated with reviews:\n'
  4653. ' * a : https://crrev.com/c/101 (open)\n'
  4654. ' b : https://crrev.com/c/102 (open)\n'
  4655. ' c : https://crrev.com/c/103 (open)\n'
  4656. ' d : https://crrev.com/c/104 (open)\n'
  4657. ' e : https://crrev.com/c/105 (open)\n'
  4658. ' f : https://crrev.com/c/106 (open)\n\n'
  4659. 'Current branch: a\n'
  4660. 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
  4661. 'Issue description:\n'
  4662. 'x\n')
  4663. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  4664. @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
  4665. @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
  4666. @mock.patch('git_cl.RunGit', _mock_run_git)
  4667. @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
  4668. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  4669. @mock.patch('git_cl.Settings.IsStatusCommitOrderByDate', return_value=False)
  4670. @mock.patch('scm.GIT.GetBranch', return_value='a')
  4671. def testStatusByDate(self, *_mocks):
  4672. self.assertEqual(
  4673. 0, git_cl.main(['status', '--no-branch-color', '--date-order']))
  4674. self.maxDiff = None
  4675. self.assertEqual(
  4676. sys.stdout.getvalue(), 'Branches associated with reviews:\n'
  4677. ' f : https://crrev.com/c/106 (open)\n'
  4678. ' e : https://crrev.com/c/105 (open)\n'
  4679. ' d : https://crrev.com/c/104 (open)\n'
  4680. ' c : https://crrev.com/c/103 (open)\n'
  4681. ' b : https://crrev.com/c/102 (open)\n'
  4682. ' * a : https://crrev.com/c/101 (open)\n\n'
  4683. 'Current branch: a\n'
  4684. 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
  4685. 'Issue description:\n'
  4686. 'x\n')
  4687. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  4688. @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
  4689. @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
  4690. @mock.patch('git_cl.RunGit', _mock_run_git)
  4691. @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
  4692. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  4693. @mock.patch('git_cl.Settings.IsStatusCommitOrderByDate', return_value=True)
  4694. @mock.patch('scm.GIT.GetBranch', return_value='a')
  4695. def testStatusByDate(self, *_mocks):
  4696. self.assertEqual(
  4697. 0, git_cl.main(['status', '--no-branch-color']))
  4698. self.maxDiff = None
  4699. self.assertEqual(
  4700. sys.stdout.getvalue(), 'Branches associated with reviews:\n'
  4701. ' f : https://crrev.com/c/106 (open)\n'
  4702. ' e : https://crrev.com/c/105 (open)\n'
  4703. ' d : https://crrev.com/c/104 (open)\n'
  4704. ' c : https://crrev.com/c/103 (open)\n'
  4705. ' b : https://crrev.com/c/102 (open)\n'
  4706. ' * a : https://crrev.com/c/101 (open)\n\n'
  4707. 'Current branch: a\n'
  4708. 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
  4709. 'Issue description:\n'
  4710. 'x\n')
  4711. class CMDOwnersTestCase(CMDTestCaseBase):
  4712. def setUp(self):
  4713. super(CMDOwnersTestCase, self).setUp()
  4714. self.owners_by_path = {
  4715. 'foo': ['a@example.com'],
  4716. 'bar': ['b@example.com', 'c@example.com'],
  4717. }
  4718. mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
  4719. mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
  4720. mock.patch(
  4721. 'git_cl.Changelist.GetAffectedFiles',
  4722. return_value=list(self.owners_by_path)).start()
  4723. mock.patch(
  4724. 'git_cl.Changelist.GetCommonAncestorWithUpstream',
  4725. return_value='upstream').start()
  4726. mock.patch(
  4727. 'git_cl.Changelist.GetGerritHost',
  4728. return_value='host').start()
  4729. mock.patch(
  4730. 'git_cl.Changelist.GetGerritProject',
  4731. return_value='project').start()
  4732. mock.patch(
  4733. 'git_cl.Changelist.GetRemoteBranch',
  4734. return_value=('origin', 'refs/remotes/origin/main')).start()
  4735. mock.patch(
  4736. 'owners_client.OwnersClient.BatchListOwners',
  4737. return_value=self.owners_by_path).start()
  4738. mock.patch(
  4739. 'gerrit_util.IsCodeOwnersEnabledOnHost', return_value=True).start()
  4740. self.addCleanup(mock.patch.stopall)
  4741. def testShowAllNoArgs(self):
  4742. self.assertEqual(0, git_cl.main(['owners', '--show-all']))
  4743. self.assertEqual(
  4744. 'No files specified for --show-all. Nothing to do.\n',
  4745. git_cl.sys.stdout.getvalue())
  4746. def testShowAll(self):
  4747. self.assertEqual(
  4748. 0,
  4749. git_cl.main(['owners', '--show-all', 'foo', 'bar', 'baz']))
  4750. owners_client.OwnersClient.BatchListOwners.assert_called_once_with(
  4751. ['foo', 'bar', 'baz'])
  4752. self.assertEqual(
  4753. '\n'.join([
  4754. 'Owners for foo:',
  4755. ' - a@example.com',
  4756. 'Owners for bar:',
  4757. ' - b@example.com',
  4758. ' - c@example.com',
  4759. 'Owners for baz:',
  4760. ' - No owners found',
  4761. '',
  4762. ]),
  4763. sys.stdout.getvalue())
  4764. def testBatch(self):
  4765. self.assertEqual(0, git_cl.main(['owners', '--batch']))
  4766. self.assertIn('a@example.com', sys.stdout.getvalue())
  4767. self.assertIn('b@example.com', sys.stdout.getvalue())
  4768. if __name__ == '__main__':
  4769. logging.basicConfig(
  4770. level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
  4771. unittest.main()