123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374 |
- # -*- coding: utf-8 -*-
- """
- (c) 2015 - Copyright Red Hat Inc
- Authors:
- Pierre-Yves Chibon <pingou@pingoured.fr>
- """
- __requires__ = ['SQLAlchemy >= 0.8']
- import pkg_resources
- import json
- import unittest
- import shutil
- import sys
- import os
- import tempfile
- import pygit2
- from mock import patch
- from pagure.lib.repo import PagureRepo
- sys.path.insert(0, os.path.join(os.path.dirname(
- os.path.abspath(__file__)), '..'))
- import pagure.lib.git
- import tests
- class PagureLibGittests(tests.Modeltests):
- """ Tests for pagure.lib.git """
- def setUp(self):
- """ Set up the environnment, ran before every tests. """
- super(PagureLibGittests, self).setUp()
- pagure.lib.git.SESSION = self.session
- pagure.APP.config['GIT_FOLDER'] = os.path.join(
- tests.HERE, 'repos')
- pagure.APP.config['FORK_FOLDER'] = os.path.join(
- tests.HERE, 'forks')
- pagure.APP.config['TICKETS_FOLDER'] = os.path.join(
- tests.HERE, 'tickets')
- pagure.APP.config['DOCS_FOLDER'] = os.path.join(
- tests.HERE, 'docs')
- pagure.APP.config['REQUESTS_FOLDER'] = os.path.join(
- tests.HERE, 'requests')
- def test_write_gitolite_acls(self):
- """ Test the write_gitolite_acls function of pagure.lib.git. """
- tests.create_projects(self.session)
- repo = pagure.lib.get_project(self.session, 'test')
- # 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='test3',
- description='test project #2',
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(tests.HERE, 'test_gitolite.conf')
- pagure.lib.git.write_gitolite_acls(self.session, outputconf)
- 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 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
- """
- #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.
- """
- tests.create_projects(self.session)
- repo = pagure.lib.get_project(self.session, 'test')
- # Add a couple of groups
- msg = pagure.lib.add_group(
- self.session,
- group_name='sysadmin',
- 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',
- 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',
- parent_id=1,
- hook_token='aaabbbvvv',
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(tests.HERE, 'test_gitolite.conf')
- pagure.lib.git.write_gitolite_acls(self.session, outputconf)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@sysadmin = pingou
- @devs = pingou
- repo test
- R = @all
- RW+ = @sysadmin @devs
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = @sysadmin @devs
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = @sysadmin @devs
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = @sysadmin @devs
- 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 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
- """
- #print data
- self.assertEqual(data.split('\n'), exp.split('\n'))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_commit_to_patch(self):
- """ Test the commit_to_patch function of pagure.lib.git. """
- # Create a git repo to play with
- self.gitrepo = os.path.join(tests.HERE, '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
- []
- )
- 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
- [first_commit.oid.hex]
- )
- second_commit = repo.revparse_single('HEAD')
- # Generate a patch for 2 commits
- patch = pagure.lib.git.commit_to_patch(
- repo, [first_commit, 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)
- # Generate a patch for a single commit
- patch = pagure.lib.git.commit_to_patch(repo, 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)
- @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(tests.HERE, 'test_ticket_repo.git')
- os.makedirs(self.gitrepo)
- repo_obj = pygit2.init_repository(self.gitrepo, bare=True)
- repo = pagure.lib.get_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',
- ticketfolder=tests.HERE
- )
- self.assertEqual(msg.title, 'Test issue')
- issue = pagure.lib.search_issues(self.session, repo, issueid=1)
- pagure.lib.git.update_git(issue, repo, tests.HERE)
- 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 issue <hash>: Test issue
- ---
- diff --git a/123 b/456
- new file mode 100644
- index 0000000..60f7480
- --- /dev/null
- +++ b/456
- @@ -0,0 +1,23 @@
- +{
- + "assignee": null,
- + "blocks": [],
- + "comments": [],
- + "content": "We should work on this",
- + "date_created": null,
- + "depends": [],
- + "id": 1,
- + "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 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 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)
- # Test again after adding a comment
- msg = pagure.lib.add_issue_comment(
- session=self.session,
- issue=issue,
- comment='Hey look a comment!',
- user='foo',
- ticketfolder=tests.HERE
- )
- self.session.commit()
- self.assertEqual(msg, 'Comment added')
- # Use patch to validate the repo
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single('HEAD')
- 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
- @@ -1,7 +1,24 @@
- {
- "assignee": null,
- "blocks": [],
- - "comments": [],
- + "comments": [
- + {
- + "comment": "Hey look a comment!",
- + "date_created": null,
- + "edited_on": null,
- + "editor": null,
- + "id": 1,
- + "parent": null,
- + "user": {
- + "default_email": "foo@bar.com",
- + "emails": [
- + "foo@bar.com"
- + ],
- + "fullname": "foo bar",
- + "name": "foo"
- + }
- + }
- + ],
- "content": "We should work on this",
- "date_created": null,
- "depends": [],
- """
- 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 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 row.startswith('index'):
- row = 'index 458821a..77674a8'
- elif row.startswith('--- a/'):
- row = '--- a/123'
- elif row.startswith('+++ b/'):
- row = '+++ b/456'
- npatch.append(row)
- patch = '\n'.join(npatch)
- #print patch
- self.assertEqual(patch, exp)
- def test_clean_git(self):
- """ Test the clean_git method of pagure.lib.git. """
- pagure.lib.git.clean_git(None, None, None)
- self.test_update_git()
- gitpath = os.path.join(tests.HERE, '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_project(self.session, 'test_ticket_repo')
- issue = pagure.lib.search_issues(self.session, repo, issueid=1)
- pagure.lib.git.clean_git(issue, repo, tests.HERE)
- # 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(tests.HERE, 'test_ticket_repo.git')
- os.makedirs(self.gitrepo)
- repo_obj = pygit2.init_repository(self.gitrepo, bare=True)
- repo = pagure.lib.get_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',
- requestfolder=tests.HERE,
- 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, tests.HERE)
- 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,83 @@
- +{
- + "assignee": null,
- + "branch": "master",
- + "branch_from": "feature",
- + "closed_at": null,
- + "closed_by": null,
- + "comments": [],
- + "commit_start": null,
- + "commit_stop": null,
- + "date_created": null,
- + "id": 1,
- + "initial_comment": null,
- + "project": {
- + "date_created": null,
- + "description": "test project for ticket",
- + "id": 1,
- + "name": "test_ticket_repo",
- + "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,
- + "issue_tracker": true,
- + "project_documentation": false,
- + "pull_requests": true
- + },
- + "tags": [],
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "fullname": "PY C",
- + "name": "pingou"
- + }
- + },
- + "remote_git": null,
- + "repo_from": {
- + "date_created": null,
- + "description": "test project for ticket",
- + "id": 1,
- + "name": "test_ticket_repo",
- + "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,
- + "issue_tracker": true,
- + "project_documentation": false,
- + "pull_requests": true
- + },
- + "tags": [],
- + "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 '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(self):
- """ Test the update_ticket_from_git method from pagure.lib.git. """
- tests.create_projects(self.session)
- repo = pagure.lib.get_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"]},
- }
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_ticket_from_git,
- self.session,
- reponame='foobar',
- username=None,
- issue_uid='foobar',
- json_data=data
- )
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', username=None,
- issue_uid='foobar', json_data=data
- )
- 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].depends_text, [])
- self.assertEqual(repo.issues[0].blocks_text, [])
- data["title"] = "fake issue for tests"
- pagure.lib.git.update_ticket_from_git(
- self.session, reponame='test', username=None,
- issue_uid='foobar', json_data=data
- )
- 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].depends_text, [])
- self.assertEqual(repo.issues[0].blocks_text, [])
- 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",
- "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', username=None,
- issue_uid='foobar2', json_data=data
- )
- # 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].depends_text, [20])
- self.assertEqual(repo.issues[0].blocks_text, [])
- # New one
- self.assertEqual(repo.issues[1].uid, 'foobar2')
- self.assertEqual(repo.issues[1].title, 'Rename pagure')
- self.assertEqual(repo.issues[1].depends_text, [])
- self.assertEqual(repo.issues[1].blocks_text, [1])
- 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(tests.HERE, 'repos'))
- repo = pagure.lib.get_project(self.session, 'test')
- # Before
- self.assertEqual(len(repo.requests), 0)
- self.assertEqual(repo.requests, [])
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e56",
- "project": {
- "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": {
- "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",
- "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',
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e56',
- json_data=data,
- gitfolder=tests.HERE,
- docfolder=os.path.join(tests.HERE, 'docs'),
- ticketfolder=os.path.join(tests.HERE, 'tickets'),
- requestfolder=os.path.join(tests.HERE, 'requests')
- )
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame='test',
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e56',
- json_data=data,
- gitfolder=tests.HERE,
- docfolder=os.path.join(tests.HERE, 'docs'),
- ticketfolder=os.path.join(tests.HERE, 'tickets'),
- requestfolder=os.path.join(tests.HERE, 'requests')
- )
- 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",
- "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",
- "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",
- "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',
- username=None,
- request_uid='d4182a2ac2d541d884742d3037c26e57',
- json_data=data,
- gitfolder=tests.HERE,
- docfolder=os.path.join(tests.HERE, 'docs'),
- ticketfolder=os.path.join(tests.HERE, 'tickets'),
- requestfolder=os.path.join(tests.HERE, 'requests')
- )
- 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)
- def test_read_git_lines(self):
- """ Test the read_git_lines method of pagure.lib.git. """
- self.test_update_git()
- gitrepo = os.path.join(tests.HERE, '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(tests.HERE, '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(tests.HERE, '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(tests.HERE, '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. """
- gitrepo = os.path.join(tests.HERE, 'test_ticket_repo.git')
- repo_name = pagure.lib.git.get_repo_name(gitrepo)
- self.assertEqual(repo_name, 'test_ticket_repo')
- repo_name = pagure.lib.git.get_repo_name('foo/bar/baz/test.git')
- self.assertEqual(repo_name, 'test')
- repo_name = pagure.lib.git.get_repo_name('foo.test.git')
- self.assertEqual(repo_name, 'foo.test')
- def test_get_username(self):
- """ Test the get_username method of pagure.lib.git. """
- gitrepo = os.path.join(tests.HERE, 'test_ticket_repo.git')
- repo_name = pagure.lib.git.get_username(gitrepo)
- self.assertEqual(repo_name, None)
- repo_name = pagure.lib.git.get_username('foo/bar/baz/test.git')
- self.assertEqual(repo_name, None)
- repo_name = pagure.lib.git.get_username('foo.test.git')
- self.assertEqual(repo_name, None)
- repo_name = pagure.lib.git.get_username(
- os.path.join(tests.HERE, 'forks', 'pingou', 'foo.test.git'))
- self.assertEqual(repo_name, 'pingou')
- if __name__ == '__main__':
- SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureLibGittests)
- unittest.TextTestRunner(verbosity=2).run(SUITE)
|