12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422 |
- # -*- coding: utf-8 -*-
- """
- (c) 2015-2018 - Copyright Red Hat Inc
- Authors:
- Pierre-Yves Chibon <pingou@pingoured.fr>
- """
- from __future__ import unicode_literals
- __requires__ = ['SQLAlchemy >= 0.8']
- import pkg_resources
- import datetime
- import os
- import shutil
- import sys
- import tempfile
- import time
- import unittest
- import pygit2
- import six
- from mock import patch, MagicMock
- sys.path.insert(0, os.path.join(os.path.dirname(
- os.path.abspath(__file__)), '..'))
- import pagure
- import pagure.lib.git
- import tests
- from pagure.lib.repo import PagureRepo
- class PagureLibGittests(tests.Modeltests):
- """ Tests for pagure.lib.git """
- def test_write_gitolite_acls(self):
- """ Test the write_gitolite_acls function of pagure.lib.git.
- when the new uesr is an made an admin """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test3',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(
- self.session, configfile=outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_preconf(self):
- """ Test the write_gitolite_acls function of pagure.lib.git with
- a preconf set """
- tests.create_projects(self.session)
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- preconf = os.path.join(self.path, 'header_gitolite')
- with open(preconf, 'w') as stream:
- stream.write('# this is a header that is manually added')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(
- self.session,
- outputconf,
- project=-1,
- preconf=preconf
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """# this is a header that is manually added
- # end of header
- repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data.split('\n'), exp.split('\n'))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_preconf_postconf(self):
- """ Test the write_gitolite_acls function of pagure.lib.git with
- a postconf set """
- tests.create_projects(self.session)
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- preconf = os.path.join(self.path, 'header_gitolite')
- with open(preconf, 'w') as stream:
- stream.write('# this is a header that is manually added')
- postconf = os.path.join(self.path, 'footer_gitolite')
- with open(postconf, 'w') as stream:
- stream.write('# end of generated configuration')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(
- self.session,
- outputconf,
- project=-1,
- preconf=preconf,
- postconf=postconf
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """# this is a header that is manually added
- # end of header
- repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- # end of body
- # end of generated configuration
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_postconf(self):
- """ Test the write_gitolite_acls function of pagure.lib.git with
- a preconf and a postconf set """
- tests.create_projects(self.session)
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- postconf = os.path.join(self.path, 'footer_gitolite')
- with open(postconf, 'w') as stream:
- stream.write('# end of generated configuration')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(
- self.session,
- outputconf,
- project=-1,
- postconf=postconf
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- # end of body
- # end of generated configuration
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_deploykeys(self):
- """ Test write_gitolite_acls function to add deploy keys. """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add two deploy keys (one readonly one push)
- pingou = pagure.lib.get_user(self.session, 'pingou')
- msg1 = pagure.lib.add_sshkey_to_project_or_user(
- session=self.session,
- project=repo,
- ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==',
- pushaccess=False,
- creator=pingou
- )
- msg2 = pagure.lib.add_sshkey_to_project_or_user(
- session=self.session,
- project=repo,
- ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC9Xwc2RDzPBhlEDARfHldGjudIVoa04tqT1JVKGQmyllTFz7Rb8CngQL3e7zyNzotnhwYKHdoiLlPkVEiDee4dWMUe48ilqId+FJZQGhyv8fu4BoFdE1AJUVylzmltbLg14VqG5gjTpXgtlrEva9arKwBMHJjRYc8ScaSn3OgyQw==',
- pushaccess=True,
- creator=pingou
- )
- self.session.commit()
- self.assertEqual(msg1, 'SSH key added')
- self.assertEqual(msg2, 'SSH key added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test3',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo docs/test
- R = @all
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo tickets/test
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo requests/test
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_ticket(self):
- """ Test the write_gitolite_acls function of pagure.lib.git.
- when the new uesr is just a ticketer """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- access='ticket'
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test3',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_commit(self):
- """ Test the write_gitolite_acls function of pagure.lib.git.
- when the new uesr is just a committer """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- access='commit'
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test3',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_groups(self):
- """ Test the write_gitolite_acls function of pagure.lib.git with
- groups as admin
- """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add a couple of groups
- # They would be admins
- msg = pagure.lib.add_group(
- self.session,
- group_name='sysadmin',
- display_name='sysadmin group',
- description=None,
- group_type='user',
- user='pingou',
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, 'User `pingou` added to the group `sysadmin`.')
- msg = pagure.lib.add_group(
- self.session,
- group_name='devs',
- display_name='devs group',
- description=None,
- group_type='user',
- user='pingou',
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, 'User `pingou` added to the group `devs`.')
- # Associate these groups to a project
- msg = pagure.lib.add_group_to_project(
- session=self.session,
- project=repo,
- new_group='sysadmin',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'Group added')
- msg = pagure.lib.add_group_to_project(
- session=self.session,
- project=repo,
- new_group='devs',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'Group added')
- # Add an user to a project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test2',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@devs = pingou
- @sysadmin = pingou
- # end of groups
- repo test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test2
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test2
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test2
- RW+ = pingou
- repo requests/forks/pingou/test2
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data.split('\n'), exp.split('\n'))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_groups_ticket(self):
- """ Test the write_gitolite_acls function of pagure.lib.git with
- groups as ticketers
- """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add a couple of groups
- # They would be ticketers
- msg = pagure.lib.add_group(
- self.session,
- group_name='sysadmin',
- display_name='sysadmin group',
- description=None,
- group_type='user',
- user='pingou',
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, 'User `pingou` added to the group `sysadmin`.')
- msg = pagure.lib.add_group(
- self.session,
- group_name='devs',
- display_name='devs group',
- description=None,
- group_type='user',
- user='pingou',
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, 'User `pingou` added to the group `devs`.')
- # Associate these groups to a project
- msg = pagure.lib.add_group_to_project(
- session=self.session,
- project=repo,
- new_group='sysadmin',
- user='pingou',
- access='ticket',
- )
- self.session.commit()
- self.assertEqual(msg, 'Group added')
- msg = pagure.lib.add_group_to_project(
- session=self.session,
- project=repo,
- new_group='devs',
- user='pingou',
- access='ticket'
- )
- self.session.commit()
- self.assertEqual(msg, 'Group added')
- # Add an user to a project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test2',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@devs = pingou
- @sysadmin = pingou
- # end of groups
- repo test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test2
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test2
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test2
- RW+ = pingou
- repo requests/forks/pingou/test2
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data.split('\n'), exp.split('\n'))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_groups_commit(self):
- """ Test the write_gitolite_acls function of pagure.lib.git with
- groups as committers
- """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Add a couple of groups
- # They would be committers
- msg = pagure.lib.add_group(
- self.session,
- group_name='sysadmin',
- display_name='sysadmin group',
- description=None,
- group_type='user',
- user='pingou',
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, 'User `pingou` added to the group `sysadmin`.')
- msg = pagure.lib.add_group(
- self.session,
- group_name='devs',
- display_name='devs group',
- description=None,
- group_type='user',
- user='pingou',
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, 'User `pingou` added to the group `devs`.')
- # Associate these groups to a project
- msg = pagure.lib.add_group_to_project(
- session=self.session,
- project=repo,
- new_group='sysadmin',
- user='pingou',
- access='commit'
- )
- self.session.commit()
- self.assertEqual(msg, 'Group added')
- msg = pagure.lib.add_group_to_project(
- session=self.session,
- project=repo,
- new_group='devs',
- user='pingou',
- access='commit'
- )
- self.session.commit()
- self.assertEqual(msg, 'Group added')
- # Add an user to a project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test2',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@devs = pingou
- @sysadmin = pingou
- # end of groups
- repo test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test2
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test2
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test2
- RW+ = pingou
- repo requests/forks/pingou/test2
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data.split('\n'), exp.split('\n'))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_project_pr_only(self):
- """ Test the write_gitolite_acls function of pagure.lib.git.
- when the project enforces the PR approach.
- """
- tests.create_projects(self.session)
- repo = pagure.lib._get_project(self.session, 'test')
- # Make the project enforce the PR workflow
- settings = repo.settings
- settings['pull_request_access_only'] = True
- repo.settings = settings
- self.session.add(repo)
- self.session.commit()
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test3',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- @patch.dict('pagure.config.config', {'PR_ONLY': True})
- def test_write_gitolite_global_pr_only(self):
- """ Test the write_gitolite_acls function of pagure.lib.git.
- when the pagure instance enforces the PR approach.
- """
- tests.create_projects(self.session)
- repo = pagure.lib._get_project(self.session, 'test')
- self.assertFalse(repo.settings['pull_request_access_only'])
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.add_user_to_project(
- session=self.session,
- project=repo,
- new_user='foo',
- user='pingou',
- )
- self.session.commit()
- self.assertEqual(msg, 'User added')
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test3',
- description='test project #2',
- is_fork=True,
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, 'test_gitolite.conf')
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- #print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- @patch('pagure.lib.notify.send_email')
- def test_update_git(self, email_f):
- """ Test the update_git of pagure.lib.git. """
- email_f.return_value = True
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test_ticket_repo',
- description='test project for ticket',
- hook_token='aaabbbwww',
- )
- self.session.add(item)
- self.session.commit()
- # Create repo
- self.gitrepo = os.path.join(self.path, 'repos', 'tickets',
- 'test_ticket_repo.git')
- pygit2.init_repository(self.gitrepo, bare=True)
- repo = pagure.lib.get_authorized_project(self.session, 'test_ticket_repo')
- # Create an issue to play with
- msg = pagure.lib.new_issue(
- session=self.session,
- repo=repo,
- title='Test issue',
- content='We should work on this',
- user='pingou',
- )
- self.assertEqual(msg.title, 'Test issue')
- issue = pagure.lib.search_issues(self.session, repo, issueid=1)
- pagure.lib.git.update_git(issue, repo).get()
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single('HEAD')
- # Use patch to validate the repo
- commit_patch = pagure.lib.git.commit_to_patch(repo, commit)
- exp = """Mon Sep 17 00:00:00 2001
- From: pagure <pagure>
- Subject: Updated issue <hash>: Test issue
- ---
- diff --git a/123 b/456
- new file mode 100644
- index 0000000..60f7480
- --- /dev/null
- +++ b/456
- @@ -0,0 +1,28 @@
- +{
- + "assignee": null,
- + "blocks": [],
- + "close_status": null,
- + "closed_at": null,
- + "comments": [],
- + "content": "We should work on this",
- + "custom_fields": [],
- + "date_created": null,
- + "depends": [],
- + "id": 1,
- + "last_updated": null,
- + "milestone": null,
- + "priority": null,
- + "private": false,
- + "status": "Open",
- + "tags": [],
- + "title": "Test issue",
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "fullname": "PY C",
- + "name": "pingou"
- + }
- +}
- \ No newline at end of file
- """
- npatch = []
- for row in commit_patch.split('\n'):
- if row.startswith('Date:'):
- continue
- elif row.startswith('From '):
- row = row.split(' ', 2)[2]
- elif row.startswith('diff --git '):
- row = row.split(' ')
- row[2] = 'a/123'
- row[3] = 'b/456'
- row = ' '.join(row)
- elif 'Updated issue' in row:
- row = row.split()
- row[3] = '<hash>:'
- row = ' '.join(row)
- elif 'date_created' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif 'last_updated' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif 'closed_at' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif row.startswith('index 00'):
- row = 'index 0000000..60f7480'
- elif row.startswith('+++ b/'):
- row = '+++ b/456'
- npatch.append(row)
- commit_patch = '\n'.join(npatch)
- #print commit_patch
- self.assertEqual(commit_patch, exp)
- # Enforce having a different last_updated field
- # This is required as the test run fine and fast with sqlite but is
- # much slower with postgresql so we end-up with an updated
- # last_updated in postgresql but not with sqlite
- time.sleep(1)
- # Test again after adding a comment
- # We need to make sure we wait for worker to commit the comment
- with patch('pagure.lib.git._maybe_wait', tests.definitely_wait):
- msg = pagure.lib.add_issue_comment(
- session=self.session,
- issue=issue,
- comment='Hey look a comment!',
- user='foo',
- )
- self.session.commit()
- self.assertEqual(msg, 'Comment added')
- # Use patch to validate the repo
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single('HEAD')
- commit_patch = pagure.lib.git.commit_to_patch(repo, commit)
- exp = """Mon Sep 17 00:00:00 2001
- From: pagure <pagure>
- Subject: Updated issue <hash>: Test issue
- ---
- diff --git a/123 b/456
- index 458821a..77674a8
- --- a/123
- +++ b/456
- @@ -3,13 +3,32 @@
- "blocks": [],
- "close_status": null,
- "closed_at": null,
- - "comments": [],
- + "comments": [
- + {
- + "comment": "Hey look a comment!",
- + "date_created": null,
- + "edited_on": null,
- + "editor": null,
- + "id": 1,
- + "notification": false,
- + "parent": null,
- + "reactions": {},
- + "user": {
- + "default_email": "foo@bar.com",
- + "emails": [
- + "foo@bar.com"
- + ],
- + "fullname": "foo bar",
- + "name": "foo"
- + }
- + }
- + ],
- "content": "We should work on this",
- "custom_fields": [],
- "date_created": null,
- "depends": [],
- "id": 1,
- - "last_updated": "<date>",
- + "last_updated": "<date>",
- "milestone": null,
- "priority": null,
- "private": false,
- """
- npatch = []
- for row in commit_patch.split('\n'):
- if row.startswith('Date:'):
- continue
- elif row.startswith('From '):
- row = row.split(' ', 2)[2]
- elif row.startswith('diff --git '):
- row = row.split(' ')
- row[2] = 'a/123'
- row[3] = 'b/456'
- row = ' '.join(row)
- elif 'Updated issue' in row:
- row = row.split()
- row[3] = '<hash>:'
- row = ' '.join(row)
- elif 'date_created' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif 'closed_at' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif row.startswith('index'):
- row = 'index 458821a..77674a8'
- elif row.startswith('--- a/'):
- row = '--- a/123'
- elif row.startswith('+++ b/'):
- row = '+++ b/456'
- elif 'last_updated' in row:
- t = row.split(': ')[0]
- row = '%s: "<date>",' % t
- npatch.append(row)
- commit_patch = '\n'.join(npatch)
- # print commit_patch
- self.assertEqual(commit_patch, exp)
- def test_clean_git(self):
- """ Test the clean_git method of pagure.lib.git. """
- self.test_update_git()
- gitpath = os.path.join(self.path, 'repos', 'tickets',
- 'test_ticket_repo.git')
- gitrepo = pygit2.init_repository(gitpath, bare=True)
- # Get the uid of the ticket created
- commit = gitrepo.revparse_single('HEAD')
- patch = pagure.lib.git.commit_to_patch(gitrepo, commit)
- hash_file = None
- for row in patch.split('\n'):
- if row.startswith('+++ b/'):
- hash_file = row.split('+++ b/')[-1]
- break
- # The only file in git is the one of that ticket
- files = [entry.name for entry in commit.tree]
- self.assertEqual(files, [hash_file])
- repo = pagure.lib.get_authorized_project(self.session, 'test_ticket_repo')
- issue = pagure.lib.search_issues(self.session, repo, issueid=1)
- pagure.lib.git.clean_git(repo, issue.repotype, issue.uid).get()
- # No more files in the git repo
- commit = gitrepo.revparse_single('HEAD')
- files = [entry.name for entry in commit.tree]
- self.assertEqual(files, [])
- @patch('pagure.lib.notify.send_email')
- def test_update_git_requests(self, email_f):
- """ Test the update_git of pagure.lib.git for pull-requests. """
- email_f.return_value = True
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test_ticket_repo',
- description='test project for ticket',
- hook_token='aaabbbxxx',
- )
- self.session.add(item)
- self.session.commit()
- # Create repo
- self.gitrepo = os.path.join(self.path, 'repos', 'requests',
- 'test_ticket_repo.git')
- pygit2.init_repository(self.gitrepo, bare=True)
- # Create a PR to play with
- repo = pagure.lib.get_authorized_project(self.session, 'test_ticket_repo')
- # Create an issue to play with
- req = pagure.lib.new_pull_request(
- session=self.session,
- repo_from=repo,
- branch_from='feature',
- repo_to=repo,
- branch_to='master',
- title='test PR',
- user='pingou',
- requestuid='foobar',
- requestid=None,
- status='Open',
- notify=True
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, 'test PR')
- request = repo.requests[0]
- self.assertEqual(request.title, 'test PR')
- pagure.lib.git.update_git(request, request.project).get()
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single('HEAD')
- # Use patch to validate the repo
- patch = pagure.lib.git.commit_to_patch(repo, commit)
- exp = """Mon Sep 17 00:00:00 2001
- From: pagure <pagure>
- Subject: Updated pull-request <hash>: test PR
- ---
- diff --git a/123 b/456
- new file mode 100644
- index 0000000..60f7480
- --- /dev/null
- +++ b/456
- @@ -0,0 +1,143 @@
- +{
- + "assignee": null,
- + "branch": "master",
- + "branch_from": "feature",
- + "cached_merge_status": "unknown",
- + "closed_at": null,
- + "closed_by": null,
- + "comments": [],
- + "commit_start": null,
- + "commit_stop": null,
- + "date_created": null,
- + "id": 1,
- + "initial_comment": null,
- + "last_updated": null,
- + "project": {
- + "access_groups": {
- + "admin": [],
- + "commit": [],
- + "ticket": []
- + },
- + "access_users": {
- + "admin": [],
- + "commit": [],
- + "owner": [
- + "pingou"
- + ],
- + "ticket": []
- + },
- + "close_status": [],
- + "custom_keys": [],
- + "date_created": null,
- + "date_modified": null,
- + "description": "test project for ticket",
- + "fullname": "test_ticket_repo",
- + "id": 1,
- + "milestones": {},
- + "name": "test_ticket_repo",
- + "namespace": null,
- + "parent": null,
- + "priorities": {},
- + "settings": {
- + "Enforce_signed-off_commits_in_pull-request": false,
- + "Minimum_score_to_merge_pull-request": -1,
- + "Only_assignee_can_merge_pull-request": false,
- + "Web-hooks": null,
- + "always_merge": false,
- + "disable_non_fast-forward_merges": false,
- + "fedmsg_notifications": true,
- + "issue_tracker": true,
- + "issue_tracker_read_only": false,
- + "issues_default_to_private": false,
- + "notify_on_commit_flag": false,
- + "notify_on_pull-request_flag": false,
- + "open_metadata_access_to_all": false,
- + "project_documentation": false,
- + "pull_request_access_only": false,
- + "pull_requests": true,
- + "stomp_notifications": true
- + },
- + "tags": [],
- + "url_path": "test_ticket_repo",
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "fullname": "PY C",
- + "name": "pingou"
- + }
- + },
- + "remote_git": null,
- + "repo_from": {
- + "access_groups": {
- + "admin": [],
- + "commit": [],
- + "ticket": []
- + },
- + "access_users": {
- + "admin": [],
- + "commit": [],
- + "owner": [
- + "pingou"
- + ],
- + "ticket": []
- + },
- + "close_status": [],
- + "custom_keys": [],
- + "date_created": null,
- + "date_modified": null,
- + "description": "test project for ticket",
- + "fullname": "test_ticket_repo",
- + "id": 1,
- + "milestones": {},
- + "name": "test_ticket_repo",
- + "namespace": null,
- + "parent": null,
- + "priorities": {},
- + "settings": {
- + "Enforce_signed-off_commits_in_pull-request": false,
- + "Minimum_score_to_merge_pull-request": -1,
- + "Only_assignee_can_merge_pull-request": false,
- + "Web-hooks": null,
- + "always_merge": false,
- + "disable_non_fast-forward_merges": false,
- + "fedmsg_notifications": true,
- + "issue_tracker": true,
- + "issue_tracker_read_only": false,
- + "issues_default_to_private": false,
- + "notify_on_commit_flag": false,
- + "notify_on_pull-request_flag": false,
- + "open_metadata_access_to_all": false,
- + "project_documentation": false,
- + "pull_request_access_only": false,
- + "pull_requests": true,
- + "stomp_notifications": true
- + },
- + "tags": [],
- + "url_path": "test_ticket_repo",
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "fullname": "PY C",
- + "name": "pingou"
- + }
- + },
- + "status": "Open",
- + "title": "test PR",
- + "uid": "foobar",
- + "updated_on": null,
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "fullname": "PY C",
- + "name": "pingou"
- + }
- +}
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- elif row.startswith('From '):
- row = row.split(' ', 2)[2]
- elif row.startswith('diff --git '):
- row = row.split(' ')
- row[2] = 'a/123'
- row[3] = 'b/456'
- row = ' '.join(row)
- elif 'Updated pull-request' in row:
- row = row.split()
- row[3] = '<hash>:'
- row = ' '.join(row)
- elif 'date_created' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif 'date_modified' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif 'last_updated' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif 'updated_on' in row:
- t = row.split(': ')[0]
- row = '%s: null,' % t
- elif row.startswith('index 00'):
- row = 'index 0000000..60f7480'
- elif row.startswith('+++ b/'):
- row = '+++ b/456'
- npatch.append(row)
- patch = '\n'.join(npatch)
- print(patch)
- self.assertEqual(patch, exp)
- def test_update_ticket_from_git_no_priority(self):
- """ Test the update_ticket_from_git method from pagure.lib.git. """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- data = {
- "status": "Open", "title": "foo", "comments": [],
- "content": "bar", "date_created": "1426500263",
- "user": {
- "name": "pingou", "emails": ["pingou@fedoraproject.org"]},
- "milestone": "Next Release",
- "priority": 1,
- }
- # Invalid project
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_ticket_from_git,
- self.session,
- reponame='foobar',
- namespace=None,
- username=None,
- issue_uid='foobar',
- json_data=data,
- agent='pingou',
- )
- # Create the issue
- data = {
- "status": "Open", "title": "foo", "comments": [],
- "content": "bar", "date_created": "1426500263",
- "user": {
- "name": "pingou", "emails": ["pingou@fedoraproject.org"]},
- "milestone": "Next Release",
- }
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar', json_data=data, agent='pingou',
- )
- self.session.commit()
- # Edit the issue
- data = {
- "status": "Open", "title": "foo", "comments": [],
- "content": "bar", "date_created": "1426500263",
- "user": {
- "name": "pingou", "emails": ["pingou@fedoraproject.org"]},
- "milestone": "Next Release",
- "priority": 1,
- }
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar', json_data=data, agent='pingou',
- )
- self.session.commit()
- # Data contained a priority but not the project, so bailing
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, 'foobar')
- self.assertEqual(repo.issues[0].title, 'foo')
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].milestone, 'Next Release')
- self.assertEqual(repo.issues[0].priority, None)
- self.assertEqual(
- repo.milestones,
- {'Next Release': {'active': True, 'date': None}})
- @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
- def test_update_ticket_from_git_close_ticket(self):
- """ Test the update_ticket_from_git method from pagure.lib.git. """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- # Create the issue
- data = {
- "status": "Open",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "foo",
- "emails": ["foo@fedoraproject.org"]
- },
- "milestone": "Next Release",
- }
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar', json_data=data, agent='pingou',
- )
- self.session.commit()
- # Edit the issue
- data = {
- "status": "Closed",
- "close_status": "Fixed",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "foo",
- "emails": ["foo@fedoraproject.org"]
- },
- "milestone": "Next Release",
- }
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar', json_data=data, agent='pingou',
- )
- self.session.commit()
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, 'foobar')
- self.assertEqual(repo.issues[0].title, 'foo')
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].milestone, 'Next Release')
- self.assertEqual(repo.issues[0].priority, None)
- self.assertEqual(
- repo.milestones,
- {'Next Release': {'active': True, 'date': None}})
- self.assertEqual(repo.issues[0].status, 'Closed')
- self.assertEqual(repo.issues[0].close_status, 'Fixed')
- self.assertIsNotNone(repo.issues[0].closed_at)
- self.assertEqual(
- repo.issues[0].comments[-1].comment,
- '**Metadata Update from @pingou**:\n'
- '- Issue close_status updated to: Fixed\n'
- '- Issue status updated to: Closed (was: Open)'
- )
- def test_update_ticket_from_git(self):
- """ Test the update_ticket_from_git method from pagure.lib.git. """
- tests.create_projects(self.session)
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- # Set some priorities to the project
- repo.priorities = {'1': 'High', '2': 'Normal'}
- self.session.add(repo)
- self.session.commit()
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- data = {
- "status": "Open", "title": "foo", "comments": [],
- "content": "bar", "date_created": "1426500263",
- "user": {
- "name": "pingou", "emails": ["pingou@fedoraproject.org"]},
- "milestone": "Next Release",
- "priority": 1,
- }
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_ticket_from_git,
- self.session,
- reponame='foobar',
- namespace=None,
- username=None,
- issue_uid='foobar',
- json_data=data,
- agent='pingou',
- )
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar', json_data=data, agent='pingou',
- )
- self.session.commit()
- # After 1 insertion
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, 'foobar')
- self.assertEqual(repo.issues[0].title, 'foo')
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].milestone, 'Next Release')
- self.assertEqual(repo.issues[0].priority, 1)
- self.assertIsNone(repo.issues[0].closed_at)
- self.assertEqual(
- repo.milestones,
- {'Next Release': {'active': True, 'date': None}})
- data["title"] = "fake issue for tests"
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar', json_data=data, agent='pingou',
- )
- self.session.commit()
- # After edit
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, 'foobar')
- self.assertEqual(repo.issues[0].title, 'fake issue for tests')
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].priority, 1)
- self.assertIsNone(repo.issues[0].closed_at)
- data = {
- "status": "Open", "title": "Rename pagure", "private": False,
- "content": "This is too much of a conflict with the book",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"]
- },
- "id": 20,
- "blocks": [1],
- "depends": [3, 4],
- "date_created": "1426595224",
- "milestone": "Future",
- "priority": 1,
- "comments": [
- {
- "comment": "Nirik:\r\n\r\n- sourceforge++ \r\n- "
- "gitmaker\r\n- mastergit \r\n- hostomatic\r\n- "
- "gitcorp\r\n- git-keiretsu \r\n- gitbuffet\r\n- "
- "cogitator\r\n- cogitate\r\n\r\nrandomuser:\r\n\r\n- "
- "COLLABORATRON5000\r\n- git-sm\\u00f6rg\\u00e5sbord\r\n- "
- "thislittlegittywenttomarket\r\n- git-o-rama\r\n- "
- "gitsundheit",
- "date_created": "1426595224", "id": 250, "parent": None,
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"]
- }
- },
- {
- "comment": "Nirik:\r\n\r\n- sourceforge++ \r\n- "
- "gitmaker\r\n- mastergit \r\n- hostomatic\r\n- "
- "gitcorp\r\n- git-keiretsu \r\n- gitbuffet\r\n- "
- "cogitator\r\n- cogitate\r\n\r\nrandomuser:\r\n\r\n- "
- "COLLABORATRON5000\r\n- git-sm\\u00f6rg\\u00e5sbord\r\n- "
- "thislittlegittywenttomarket\r\n- git-o-rama\r\n- "
- "gitsundheit",
- "date_created": "1426595340", "id": 324, "parent": None,
- "user": {
- "fullname": "Ralph Bean",
- "name": "ralph",
- "default_email": "ralph@fedoraproject.org",
- "emails": ["ralph@fedoraproject.org"]
- }
- }
- ]
- }
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', namespace=None, username=None,
- issue_uid='foobar2', json_data=data, agent='pingou',
- )
- # After second insertion
- self.assertEqual(len(repo.issues), 2)
- self.assertEqual(repo.issues[0].uid, 'foobar')
- self.assertEqual(repo.issues[0].title, 'fake issue for tests')
- self.assertEqual(repo.issues[0].depending_text, [20])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertIsNone(repo.issues[0].closed_at)
- # New one
- self.assertEqual(repo.issues[1].uid, 'foobar2')
- self.assertEqual(repo.issues[1].title, 'Rename pagure')
- self.assertEqual(repo.issues[1].depending_text, [])
- self.assertEqual(repo.issues[1].blocking_text, [1])
- self.assertEqual(repo.issues[1].milestone, 'Future')
- self.assertIsNone(repo.issues[1].closed_at)
- self.assertDictEqual(
- repo.milestones,
- {
- 'Future': {'active': True, 'date': None},
- 'Next Release': {'active': True, 'date': None}
- }
- )
- def test_update_request_from_git(self):
- """ Test the update_request_from_git method from pagure.lib.git. """
- tests.create_projects(self.session)
- tests.create_projects_git(os.path.join(self.path, 'repos'))
- repo = pagure.lib._get_project(self.session, 'test')
- namespaced_repo = pagure.lib._get_project(self.session, 'test3', namespace='somenamespace')
- # Before
- self.assertEqual(len(repo.requests), 0)
- self.assertEqual(repo.requests, [])
- self.assertEqual(len(namespaced_repo.requests), 0)
- self.assertEqual(namespaced_repo.requests, [])
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e56",
- "project": {
- "custom_keys": [],
- "parent": None,
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "id": 1,
- "description": "test project"
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"]
- },
- "id": 7,
- "comments": [
- {
- "comment": "really?",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"]
- },
- "parent": None,
- "date_created": "1426843778",
- "commit": "fa72f315373ec5f98f2b08c8ffae3645c97aaad2",
- "line": 5,
- "id": 1,
- "filename": "test"
- },
- {
- "comment": "Again ?",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "parent": None,
- "date_created": "1426866781",
- "commit": "94ebaf900161394059478fd88aec30e59092a1d7",
- "line": 5,
- "id": 2,
- "filename": "test2"
- },
- {
- "comment": "Should be fine in fact",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "parent": None,
- "date_created": "1426866950",
- "commit": "94ebaf900161394059478fd88aec30e59092a1d7",
- "line": 5,
- "id": 3,
- "filename": "test2"
- }
- ],
- "branch_from": "master",
- "title": "test request",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "custom_keys": [],
- "parent": None,
- "name": "test",
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project"
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": [
- "fake@fedoraproject.org"
- ]
- },
- "id": 6,
- "description": "test project"
- },
- "branch": "master",
- "date_created": "1426843732"
- }
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_request_from_git,
- self.session,
- reponame='foobar',
- namespace=None,
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e56',
- json_data=data,
- )
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame='test',
- namespace=None,
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e56',
- json_data=data,
- )
- self.session.commit()
- # After 1 st insertion
- self.assertEqual(len(repo.requests), 1)
- self.assertEqual(repo.requests[0].id, 7)
- self.assertEqual(
- repo.requests[0].uid, 'd4182a2ac2d541d884742d3037c26e56')
- self.assertEqual(repo.requests[0].title, 'test request')
- self.assertEqual(len(repo.requests[0].comments), 3)
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e57",
- "project": {
- "parent": None,
- "name": "test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project"
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"]
- },
- "id": 4,
- "comments": [],
- "branch_from": "master",
- "title": "test request #2",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "parent": None,
- "name": "test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project"
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": [
- "fake@fedoraproject.org"
- ]
- },
- "project_docs": True,
- "id": 6,
- "description": "test project"
- },
- "branch": "master",
- "date_created": "1426843745"
- }
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame='test',
- namespace=None,
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e57',
- json_data=data,
- )
- self.session.commit()
- # After 2 nd insertion
- self.assertEqual(len(repo.requests), 2)
- self.assertEqual(repo.requests[0].id, 7)
- self.assertEqual(
- repo.requests[0].uid, 'd4182a2ac2d541d884742d3037c26e56')
- self.assertEqual(repo.requests[0].title, 'test request')
- self.assertEqual(len(repo.requests[0].comments), 3)
- # 2 entry
- self.assertEqual(repo.requests[1].id, 4)
- self.assertEqual(
- repo.requests[1].uid, 'd4182a2ac2d541d884742d3037c26e57')
- self.assertEqual(repo.requests[1].title, 'test request #2')
- self.assertEqual(len(repo.requests[1].comments), 0)
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e58",
- "project": {
- "parent": None,
- "name": "test3",
- "custom_keys": [],
- "namespace": "somenamespace",
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 3,
- "description": "namespaced test project"
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"]
- },
- "id": 5,
- "comments": [],
- "branch_from": "master",
- "title": "test request to namespaced repo",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "parent": None,
- "name": "test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": [
- "pingou@fedoraproject.org"
- ]
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project"
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": [
- "fake@fedoraproject.org"
- ]
- },
- "project_docs": True,
- "id": 6,
- "description": "test project"
- },
- "branch": "master",
- "date_created": "1426843745"
- }
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame='test3',
- namespace='somenamespace',
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e58',
- json_data=data,
- )
- self.session.commit()
- self.assertEqual(len(namespaced_repo.requests), 1)
- self.assertEqual(namespaced_repo.requests[0].id, 5)
- self.assertEqual(
- namespaced_repo.requests[0].uid,
- 'd4182a2ac2d541d884742d3037c26e58'
- )
- self.assertEqual(
- namespaced_repo.requests[0].title,
- 'test request to namespaced repo'
- )
- def test_read_git_lines(self):
- """ Test the read_git_lines method of pagure.lib.git. """
- self.test_update_git()
- gitrepo = os.path.join(self.path, 'repos', 'tickets', 'test_ticket_repo.git')
- output = pagure.lib.git.read_git_lines(
- ['log', '-1', "--pretty='%s'"], gitrepo)
- self.assertEqual(len(output), 1)
- self.assertTrue(
- output[0].startswith("'Updated issue ")
- )
- self.assertTrue(
- output[0].endswith(": Test issue'")
- )
- # Keeping the new line symbol
- output = pagure.lib.git.read_git_lines(
- ['log', '-1', "--pretty='%s'"], gitrepo, keepends=True)
- self.assertEqual(len(output), 1)
- self.assertTrue(
- output[0].endswith(": Test issue'\n")
- )
- def test_get_revs_between(self):
- """ Test the get_revs_between method of pagure.lib.git. """
- self.test_update_git()
- gitrepo = os.path.join(self.path, 'repos', 'tickets', 'test_ticket_repo.git')
- output = pagure.lib.git.read_git_lines(
- ['log', '-3', "--pretty='%H'"], gitrepo)
- self.assertEqual(len(output), 2)
- from_hash = output[1].replace("'", '')
- # Case 1, repo BASE is null and HEAD is equal to from_hash
- to_hash = '0'
- output1 = pagure.lib.git.get_revs_between(
- to_hash, from_hash, gitrepo, 'refs/heads/master')
- self.assertEqual(output1, [from_hash])
- # Case 2, get revs between two commits (to_hash, from_hash)
- to_hash = output[0].replace("'", '')
- output2 = pagure.lib.git.get_revs_between(
- to_hash, from_hash, gitrepo, 'refs/heads/master')
- self.assertEqual(output2, [to_hash])
- # Case 3, get revs between two commits (from_hash, to_hash)
- output3 = pagure.lib.git.get_revs_between(
- from_hash, to_hash, gitrepo, 'refs/heads/master')
- self.assertEqual(output3, [to_hash])
- # Case 4, get revs between two commits on two different branches
- newgitrepo = tempfile.mkdtemp(prefix='pagure-')
- newrepo = pygit2.clone_repository(gitrepo, newgitrepo)
- newrepo.create_branch('feature', newrepo.head.get_object())
- with open(os.path.join(newgitrepo, 'sources'), 'w') as stream:
- stream.write('foo\n bar')
- newrepo.index.add('sources')
- newrepo.index.write()
- # Commits the files added
- tree = newrepo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- newrepo.create_commit(
- 'refs/heads/feature', # the name of the reference to update
- author,
- committer,
- 'Add sources file for testing',
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [to_hash]
- )
- branch_commit = newrepo.revparse_single('refs/heads/feature')
- # Push to origin
- ori_remote = newrepo.remotes[0]
- PagureRepo.push(ori_remote, 'refs/heads/feature')
- # Remove the clone
- shutil.rmtree(newgitrepo)
- output4 = pagure.lib.git.get_revs_between(
- '0', branch_commit.oid.hex, gitrepo, 'refs/heads/feature')
- self.assertEqual(output4, [branch_commit.oid.hex])
- def test_get_author(self):
- """ Test the get_author method of pagure.lib.git. """
- self.test_update_git()
- gitrepo = os.path.join(self.path, 'repos', 'tickets', 'test_ticket_repo.git')
- output = pagure.lib.git.read_git_lines(
- ['log', '-3', "--pretty='%H'"], gitrepo)
- self.assertEqual(len(output), 2)
- for githash in output:
- githash = githash.replace("'", '')
- output = pagure.lib.git.get_author(githash, gitrepo)
- self.assertEqual(output, 'pagure')
- def get_author_email(self):
- """ Test the get_author_email method of pagure.lib.git. """
- self.test_update_git()
- gitrepo = os.path.join(self.path, 'tickets', 'test_ticket_repo.git')
- output = pagure.lib.git.read_git_lines(
- ['log', '-3', "--pretty='%H'"], gitrepo)
- self.assertEqual(len(output), 2)
- for githash in output:
- githash = githash.replace("'", '')
- output = pagure.lib.git.get_author_email(githash, gitrepo)
- self.assertEqual(output, 'pagure')
- def test_get_repo_name(self):
- """ Test the get_repo_name method of pagure.lib.git. """
- def runtest(reponame, *path):
- gitrepo = os.path.join(self.path, 'repos', *path)
- os.makedirs(gitrepo)
- repo_name = pagure.lib.git.get_repo_name(gitrepo)
- self.assertEqual(repo_name, reponame)
- runtest('test_ticket_repo', 'tickets', 'test_ticket_repo.git')
- runtest('test', 'test.git')
- runtest('foo.test', 'foo.test.git')
- def test_get_username(self):
- """ Test the get_username method of pagure.lib.git. """
- def runtest(username, *path):
- gitrepo = os.path.join(self.path, 'repos', *path)
- os.makedirs(gitrepo)
- repo_username = pagure.lib.git.get_username(gitrepo)
- self.assertEqual(repo_username, username)
- runtest(None, 'tickets', 'test_ticket_repo.git')
- runtest(None, 'test.git')
- runtest(None, 'foo.test.git')
- runtest('pingou', 'forks', 'pingou', 'foo.test.git')
- runtest('pingou', 'forks', 'pingou', 'bar/foo.test.git')
- def test_get_repo_namespace(self):
- """ Test the get_repo_namespace method of pagure.lib.git. """
- def runtest(namespace, *path):
- gitrepo = os.path.join(self.path, 'repos', *path)
- if not os.path.exists(gitrepo):
- os.makedirs(gitrepo)
- repo_namespace = pagure.lib.git.get_repo_namespace(gitrepo)
- self.assertEqual(repo_namespace, namespace)
- runtest(None, 'test_ticket_repo.git')
- runtest('foo/bar/baz', 'foo', 'bar', 'baz', 'test.git')
- runtest(None, 'foo.test.git')
- runtest(None, 'forks', 'user', 'foo.test.git')
- runtest('bar', 'forks', 'user', 'bar', 'foo.test.git')
- runtest('ns/bar', 'forks', 'user', 'ns', 'bar', 'foo.test.git')
- runtest('bar', 'forks', 'user', 'bar', 'foo.test.git')
- def test_update_custom_fields_from_json(self):
- """ Test the update_custom_fields_from_json method of lib.git """
- tests.create_projects(self.session)
- repo = pagure.lib._get_project(self.session, 'test')
- # Create issues to play with
- pagure.lib.new_issue(
- session=self.session,
- repo=repo,
- title='Test issue',
- content='We should work on this',
- user='pingou',
- issue_uid='someuid'
- )
- self.session.commit()
- issue = pagure.lib.get_issue_by_uid(self.session, 'someuid')
- # Fake json data, currently without custom_fields
- # This should bring no new custom_fields to the issue
- json_data = {
- "status": "Open",
- "title": "Test issue",
- "private": False,
- "content": "We should work on this",
- "user": {
- "fullname": "PY C",
- "name": "pingou",
- "default_email": "bar@pingou.com",
- "emails": ["bar@pingou.com"]
- },
- "id": 1,
- "blocks": [],
- "depends": [],
- "date_created": "1234567",
- "comments": [],
- }
- pagure.lib.git.update_custom_field_from_json(
- self.session, repo, issue, json_data)
- updated_issue = pagure.lib.get_issue_by_uid(self.session, 'someuid')
- self.assertEqual(updated_issue.to_json().get('custom_fields'), [])
- custom_fields = [
- {
- "name": "custom1",
- "key_type": "text",
- "value": "value1",
- "key_data": None,
- },
- {
- "name": "custom2",
- "key_type": "text",
- "value": "value2",
- "key_data": None,
- }
- ]
- # Again, Fake the json data but, with custom_fields in it
- # The updated issue should have the custom_fields as
- # was in the json_data
- json_data = {
- "status": "Open",
- "title": "Test issue",
- "private": False,
- "content": "We should work on this",
- "user": {
- "fullname": "PY C",
- "name": "pingou",
- "default_email": "bar@pingou.com",
- "emails": ["bar@pingou.com"]
- },
- "id": 1,
- "blocks": [],
- "depends": [],
- "date_created": "1234567",
- "comments": [],
- "custom_fields": custom_fields,
- }
- pagure.lib.git.update_custom_field_from_json(
- self.session, repo, issue, json_data)
- updated_issue = pagure.lib.get_issue_by_uid(self.session, 'someuid')
- custom_fields_of_issue = updated_issue.to_json().get('custom_fields')
- self.assertEqual(custom_fields_of_issue, custom_fields)
- @patch('pagure.lib.notify.send_email')
- @patch('pagure.lib.git.update_git')
- def test_merge_pull_request_no_master(self, email_f, up_git):
- """ Test the merge_pull_request function when there are no master
- branch in the repo. """
- email_f.return_value = True
- up_git.return_value = True
- gitfolder = os.path.join(self.path, 'repos')
- docfolder = os.path.join(self.path, 'docs')
- ticketfolder = os.path.join(self.path, 'tickets')
- requestfolder = os.path.join(self.path, 'requests')
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test',
- description='test project',
- hook_token='aaabbbwww',
- )
- self.session.add(item)
- self.session.commit()
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- gitrepo = os.path.join(gitfolder, repo.path)
- docrepo = os.path.join(docfolder, repo.path)
- ticketrepo = os.path.join(ticketfolder, repo.path)
- requestrepo = os.path.join(requestfolder, repo.path)
- os.makedirs(os.path.join(self.path, 'repos', 'forks', 'foo'))
- self.gitrepo = os.path.join(self.path, 'repos', 'test.git')
- os.makedirs(self.gitrepo)
- repo_obj = pygit2.init_repository(self.gitrepo, bare=True)
- # Fork the project
- task = pagure.lib.fork_project(
- session=self.session,
- user='foo',
- repo=repo,
- )
- self.session.commit()
- self.assertEqual(task.get(),
- {'endpoint': 'ui_ns.view_repo',
- 'repo': 'test',
- 'username': 'foo',
- 'namespace': None})
- # Create repo, with some content
- self.gitrepo = os.path.join(
- self.path, 'repos', 'forks', 'foo', 'test.git')
- tests.add_content_git_repo(self.gitrepo, branch='feature')
- fork_repo = pagure.lib.get_authorized_project(self.session, 'test', user='foo')
- # Create a PR to play with
- req = pagure.lib.new_pull_request(
- session=self.session,
- repo_from=fork_repo,
- branch_from='feature',
- repo_to=repo,
- branch_to='master',
- title='test PR',
- user='pingou',
- requestuid='foobar',
- requestid=None,
- status='Open',
- notify=True
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, 'test PR')
- # `master` branch not found
- msg = pagure.lib.git.merge_pull_request(
- self.session,
- request=req,
- username='pingou',
- domerge=False
- )
- self.assertEqual(msg, 'FFORWARD')
- @patch('pagure.lib.notify.send_email')
- @patch('pagure.lib.git.update_git')
- def test_merge_pull_request_closed(self, email_f, up_git):
- """ Test the merge_pull_request function when the PR was already
- closed/merged. """
- email_f.return_value = True
- up_git.return_value = True
- gitfolder = os.path.join(self.path, 'repos')
- docfolder = os.path.join(self.path, 'docs')
- ticketfolder = os.path.join(self.path, 'tickets')
- requestfolder = os.path.join(self.path, 'requests')
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test',
- description='test project',
- hook_token='aaabbbwww',
- )
- self.session.add(item)
- self.session.commit()
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- os.makedirs(os.path.join(self.path, 'repos', 'forks', 'foo'))
- self.gitrepo = os.path.join(self.path, 'repos', 'test.git')
- os.makedirs(self.gitrepo)
- repo_obj = pygit2.init_repository(self.gitrepo, bare=True)
- tests.add_content_git_repo(self.gitrepo, branch='master')
- # Fork the project
- task = pagure.lib.fork_project(
- session=self.session,
- user='foo',
- repo=repo,
- )
- self.session.commit()
- self.assertEqual(task.get(),
- {'endpoint': 'ui_ns.view_repo',
- 'repo': 'test',
- 'username': 'foo',
- 'namespace': None})
- # Create repo, with some content
- self.gitrepo = os.path.join(
- self.path, 'repos', 'forks', 'foo', 'test.git')
- tests.add_content_git_repo(self.gitrepo, branch='feature')
- fork_repo = pagure.lib.get_authorized_project(self.session, 'test', user='foo')
- # Create a PR to play with
- req = pagure.lib.new_pull_request(
- session=self.session,
- repo_from=fork_repo,
- branch_from='feature',
- repo_to=repo,
- branch_to='master',
- title='test PR',
- user='pingou',
- requestuid='foobar',
- requestid=None,
- status='Open',
- notify=True
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, 'test PR')
- # Close the PR before we ask to merge it
- req.status = 'Closed'
- req.closed_by_id = 2 # id:2 == foo
- req.closed_at = datetime.datetime(2017, 10, 20, 12, 32, 10)
- self.session.add(req)
- self.session.commit()
- # PR already closed
- six.assertRaisesRegex(
- self,
- pagure.exceptions.PagureException,
- 'This pull-request was merged or closed by foo',
- pagure.lib.git.merge_pull_request,
- self.session,
- request=req,
- username='pingou',
- domerge=False
- )
- @patch('subprocess.Popen')
- def test_generate_gitolite_acls(self, popen):
- """ Test calling generate_gitolite_acls. """
- pagure.SESSION = self.session
- pagure.lib.git.SESSION = self.session
- pagure.config.config['GITOLITE_HOME'] = '/tmp'
- proc = MagicMock()
- proc.communicate.return_value = (1, 2)
- proc.returncode = 0
- popen.return_value = proc
- helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3')
- helper.generate_acls(project=None)
- popen.assert_called_with(
- 'HOME=/tmp gitolite compile && '
- 'HOME=/tmp gitolite trigger POST_COMPILE',
- cwd='/tmp', shell=True, stderr=-1, stdout=-1
- )
- def test_is_forced_push_new_branch(self):
- self.assertFalse(
- pagure.lib.git.is_forced_push(
- '0000000000000000000000000000000000000000',
- '^0e6e0b6c931d65ee22f67205a53933d841c6eeff',
- 'path/is/not/important'
- )
- )
- class PagureLibGitCommitToPatchtests(tests.Modeltests):
- """ Tests for pagure.lib.git """
- maxDiff = None
- def setUp(self):
- """ Set up the environment for the tests. """
- super(PagureLibGitCommitToPatchtests, self).setUp()
- # Create a git repo to play with
- self.gitrepo = os.path.join(self.path, 'repos', 'test_repo.git')
- os.makedirs(self.gitrepo)
- repo = pygit2.init_repository(self.gitrepo)
- # Create a file in that git repo
- with open(os.path.join(self.gitrepo, 'sources'), 'w') as stream:
- stream.write('foo\n bar')
- repo.index.add('sources')
- repo.index.write()
- # Commits the files added
- tree = repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- repo.create_commit(
- 'refs/heads/master', # the name of the reference to update
- author,
- committer,
- 'Add sources file for testing',
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- []
- )
- self.first_commit = repo.revparse_single('HEAD')
- # Edit the sources file again
- with open(os.path.join(self.gitrepo, 'sources'), 'w') as stream:
- stream.write('foo\n bar\nbaz\n boose')
- repo.index.add('sources')
- repo.index.write()
- # Commits the files added
- tree = repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- repo.create_commit(
- 'refs/heads/master', # the name of the reference to update
- author,
- committer,
- 'Add baz and boose to the sources\n\n There are more objects to '
- 'consider',
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [self.first_commit.oid.hex]
- )
- self.second_commit = repo.revparse_single('HEAD')
- def test_commit_to_patch_first_commit(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(repo, self.first_commit)
- exp = """Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: Add sources file for testing
- ---
- diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_single_commit(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(repo, self.second_commit)
- exp = """Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: Add baz and boose to the sources
- There are more objects to consider
- ---
- diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_2_commits(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, [self.first_commit, self.second_commit])
- exp = """Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: [PATCH 1/2] Add sources file for testing
- ---
- diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: [PATCH 2/2] Add baz and boose to the sources
- There are more objects to consider
- ---
- diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_first_commit_diff(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, self.first_commit, diff_view=True)
- exp = """diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_single_commit_diff(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, self.second_commit, diff_view=True)
- exp = """diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_two_commits_diff(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, [self.first_commit, self.second_commit], diff_view=True)
- exp = """diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_first_commit_diff_separated(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patches = pagure.lib.git.commit_to_patch(
- repo, self.first_commit, diff_view=True, separated=True)
- exp = """diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """
- output = []
- for patch in patches:
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- output.append(patch)
- self.assertEqual(output, [exp])
- def test_commit_to_patch_single_commit_diff_separated(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patches = pagure.lib.git.commit_to_patch(
- repo, self.second_commit, diff_view=True, separated=True)
- exp = """diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- output = []
- for patch in patches:
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- output.append(patch)
- self.assertEqual(output, [exp])
- def test_commit_to_patch_two_commits_diff_separated(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- repo = pygit2.init_repository(self.gitrepo)
- patches = pagure.lib.git.commit_to_patch(
- repo, [self.first_commit, self.second_commit], diff_view=True,
- separated=True)
- exp = ["""diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """,
- """diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """]
- output = []
- for patch in patches:
- npatch = []
- for row in patch.split('\n'):
- if row.startswith('Date:'):
- continue
- if row.startswith('From '):
- row = row.split(' ', 2)[2]
- npatch.append(row)
- patch = '\n'.join(npatch)
- output.append(patch)
- self.assertEqual(output, exp)
- if __name__ == '__main__':
- unittest.main(verbosity=2)
|