123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529 |
- # -*- coding: utf-8 -*-
- """
- (c) 2017 - Copyright Red Hat Inc
- Authors:
- Pierre-Yves Chibon <pingou@pingoured.fr>
- """
- __requires__ = ['SQLAlchemy >= 0.8']
- import pkg_resources # noqa
- import json # noqa
- import unittest # noqa
- import shutil # noqa
- import sys # noqa
- import tempfile # noqa
- import time # noqa
- import os # noqa
- import pygit2 # noqa
- from mock import patch, MagicMock # noqa
- sys.path.insert(0, os.path.join(os.path.dirname(
- os.path.abspath(__file__)), '..'))
- import pagure.lib # noqa
- import tests # noqa
- from pagure.lib.repo import PagureRepo # noqa
- class PagureFlaskForkPrtests(tests.Modeltests):
- """ Tests for flask fork controller of pagure regarding diffing PRs """
- @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
- def setUp(self):
- """ Set up the environnment, ran before every tests. """
- super(PagureFlaskForkPrtests, self).setUp()
- # Create the main project in the DB
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test',
- description='test project #1',
- hook_token='aaabbbccc',
- )
- item.close_status = [
- 'Invalid', 'Insufficient data', 'Fixed', 'Duplicate']
- self.session.add(item)
- self.session.commit()
- # Create the fork
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name='test',
- description='test project #1',
- hook_token='aaabbbcccdd',
- parent_id=1,
- is_fork=True,
- )
- item.close_status = [
- 'Invalid', 'Insufficient data', 'Fixed', 'Duplicate']
- self.session.add(item)
- self.session.commit()
- # Create two git repos, one has 6 commits, the other 4 of which only
- # 1 isn't present in the first repo
- gitrepo = os.path.join(self.path, 'repos', 'test.git')
- pygit2.init_repository(gitrepo, bare=True)
- gitrepo2 = os.path.join(
- self.path, 'repos', 'forks', 'pingou', 'test.git')
- pygit2.init_repository(gitrepo2, bare=True)
- newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
- repopath = os.path.join(newpath, 'test')
- clone_repo = pygit2.clone_repository(gitrepo, repopath)
- # Do 3 commits to the main repo
- for i in range(3):
- with open(os.path.join(repopath, 'sources'), 'w') as stream:
- stream.write('foo%s\n bar%s\n' % (i, i))
- clone_repo.index.add('sources')
- clone_repo.index.write()
- parents = []
- try:
- last_commit = clone_repo.revparse_single('HEAD')
- parents = [last_commit.oid.hex]
- except KeyError:
- pass
- # Commits the files added
- tree = clone_repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- clone_repo.create_commit(
- 'refs/heads/master', # the name of the reference to update
- author,
- committer,
- 'Editing the file sources for testing #%s' % i,
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- parents
- )
- time.sleep(1)
- # Push to the main repo
- refname = 'refs/heads/master:refs/heads/master'
- ori_remote = clone_repo.remotes[0]
- PagureRepo.push(ori_remote, refname)
- # Push to the fork repo
- remote = clone_repo.create_remote('pingou_fork', gitrepo2)
- PagureRepo.push(remote, refname)
- # Do another 3 commits to the main repo
- for i in range(3, 6):
- with open(os.path.join(repopath, 'sources'), 'w') as stream:
- stream.write('foo%s\n bar%s\n' % (i, i))
- clone_repo.index.add('sources')
- clone_repo.index.write()
- last_commit = clone_repo.revparse_single('HEAD')
- # Commits the files added
- tree = clone_repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- clone_repo.create_commit(
- 'refs/heads/master', # the name of the reference to update
- author,
- committer,
- 'Editing the file sources for testing #%s' % i,
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [last_commit.oid.hex]
- )
- time.sleep(1)
- # Push to the main repo
- refname = 'refs/heads/master:refs/heads/master'
- ori_remote = clone_repo.remotes[0]
- PagureRepo.push(ori_remote, refname)
- # Add two commits to the fork repo
- repopath = os.path.join(newpath, 'pingou_test')
- clone_repo = pygit2.clone_repository(gitrepo2, repopath)
- with open(os.path.join(repopath, 'sources'), 'w') as stream:
- stream.write('foo\n bar\n')
- clone_repo.index.add('sources')
- clone_repo.index.write()
- last_commit = clone_repo.revparse_single('HEAD')
- # Commits the files added
- tree = clone_repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- last_commit = clone_repo.create_commit(
- 'refs/heads/feature_foo', # the name of the reference to update
- author,
- committer,
- 'New edition on side branch of the file sources for testing',
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [last_commit.oid.hex]
- )
- time.sleep(1)
- with open(os.path.join(repopath, 'sources'), 'w') as stream:
- stream.write('foo\n bar\nbaz\n')
- clone_repo.index.add('sources')
- clone_repo.index.write()
- # Commits the files added
- tree = clone_repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- last_commit = clone_repo.create_commit(
- 'refs/heads/feature_foo', # the name of the reference to update
- author,
- committer,
- 'Second edit on side branch of the file sources for testing',
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [last_commit.hex]
- )
- # Push to the fork repo
- ori_remote = clone_repo.remotes[0]
- refname = 'refs/heads/feature_foo:refs/heads/feature_foo'
- PagureRepo.push(ori_remote, refname)
- shutil.rmtree(newpath)
- # Create the PR between the two repos
- repo = pagure.lib.get_authorized_project(self.session, 'test')
- forked_repo = pagure.lib.get_authorized_project(
- self.session, 'test', user='pingou')
- req = pagure.lib.new_pull_request(
- session=self.session,
- repo_from=forked_repo,
- branch_from='feature_foo',
- repo_to=repo,
- branch_to='master',
- title='test pull-request',
- user='pingou',
- requestfolder=None,
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, 'test pull-request')
- def test_get_pr_info(self):
- """ Test pagure.ui.fork._get_pr_info """
- gitrepo = os.path.join(self.path, 'repos', 'test.git')
- gitrepo2 = os.path.join(
- self.path, 'repos', 'forks', 'pingou', 'test.git')
- diff, diff_commits, orig_commit = pagure.lib.git.get_diff_info(
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- branch_from='feature_foo',
- branch_to='master'
- )
- self.assertEqual(len(diff_commits), 2)
- self.assertEqual(
- diff_commits[0].message,
- 'Second edit on side branch of the file sources for testing'
- )
- self.assertEqual(
- diff_commits[1].message,
- 'New edition on side branch of the file sources for testing'
- )
- self.assertEqual(
- orig_commit.message,
- 'Editing the file sources for testing #5'
- )
- def test_get_pr_info_raises(self):
- """ Test pagure.ui.fork._get_pr_info """
- gitrepo = os.path.join(self.path, 'repos', 'test.git')
- gitrepo2 = os.path.join(
- self.path, 'repos', 'forks', 'pingou', 'test.git')
- self.assertRaises(
- pagure.exceptions.BranchNotFoundException,
- pagure.lib.git.get_diff_info,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- branch_from='feature',
- branch_to='master'
- )
- self.assertRaises(
- pagure.exceptions.BranchNotFoundException,
- pagure.lib.git.get_diff_info,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- branch_from='feature_foo',
- branch_to='bar'
- )
- def test_diff_pull_request(self):
- """ Test pagure.lib.git.diff_pull_request """
- gitrepo = os.path.join(self.path, 'repos', 'test.git')
- gitrepo2 = os.path.join(
- self.path, 'repos', 'forks', 'pingou', 'test.git')
- request = pagure.lib.search_pull_requests(
- self.session, requestid=1, project_id=1)
- diff_commits, diff = pagure.lib.git.diff_pull_request(
- self.session,
- request=request,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- requestfolder=None,
- with_diff=True
- )
- self.assertEqual(len(diff_commits), 2)
- self.assertEqual(
- diff_commits[0].message,
- 'Second edit on side branch of the file sources for testing'
- )
- self.assertEqual(
- diff_commits[1].message,
- 'New edition on side branch of the file sources for testing'
- )
- # Check that the PR has its PR refs
- # we don't know the task id but we'll give it 30 sec to finish
- cnt = 0
- repo = PagureRepo(gitrepo)
- while 1:
- if 'refs/pull/1/head' in list(repo.listall_references()):
- break
- cnt += 1
- if cnt == 60:
- break
- time.sleep(0.5)
- self.assertTrue(cnt < 60)
- pr_ref = repo.lookup_reference('refs/pull/1/head')
- commit = pr_ref.get_object()
- self.assertEqual(
- commit.oid.hex,
- diff_commits[0].oid.hex
- )
- def test_diff_pull_request_updated(self):
- """ Test that calling pagure.lib.git.diff_pull_request on an updated
- PR updates the PR reference
- """
- gitrepo = os.path.join(self.path, 'repos', 'test.git')
- gitrepo2 = os.path.join(
- self.path, 'repos', 'forks', 'pingou', 'test.git')
- request = pagure.lib.search_pull_requests(
- self.session, requestid=1, project_id=1)
- # Get the diff corresponding to the PR and check its ref
- diff_commits, diff = pagure.lib.git.diff_pull_request(
- self.session,
- request=request,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- requestfolder=None,
- with_diff=True
- )
- self.assertEqual(len(diff_commits), 2)
- # Check that the PR has its PR refs
- # we don't know the task id but we'll give it 30 sec to finish
- cnt = 0
- repo = PagureRepo(gitrepo)
- while 1:
- if 'refs/pull/1/head' in list(repo.listall_references()):
- break
- cnt += 1
- if cnt == 60:
- break
- time.sleep(0.5)
- self.assertTrue(cnt < 60)
- pr_ref = repo.lookup_reference('refs/pull/1/head')
- commit = pr_ref.get_object()
- self.assertEqual(
- commit.oid.hex,
- diff_commits[0].oid.hex
- )
- # Add a new commit on the fork
- repopath = os.path.join(self.path, 'pingou_test2')
- clone_repo = pygit2.clone_repository(
- gitrepo2, repopath, checkout_branch='feature_foo')
- with open(os.path.join(repopath, 'sources'), 'w') as stream:
- stream.write('foo\n bar\nbaz\nhey there\n')
- clone_repo.index.add('sources')
- clone_repo.index.write()
- last_commit = clone_repo.lookup_branch('feature_foo').get_object()
- # Commits the files added
- tree = clone_repo.index.write_tree()
- author = pygit2.Signature(
- 'Alice Author', 'alice@authors.tld')
- committer = pygit2.Signature(
- 'Cecil Committer', 'cecil@committers.tld')
- last_commit = clone_repo.create_commit(
- 'refs/heads/feature_foo', # the name of the reference to update
- author,
- committer,
- 'Third edit on side branch of the file sources for testing',
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [last_commit.oid.hex]
- )
- # Push to the fork repo
- ori_remote = clone_repo.remotes[0]
- refname = 'refs/heads/feature_foo:refs/heads/feature_foo'
- PagureRepo.push(ori_remote, refname)
- # Get the new diff for that PR and check its new ref
- diff_commits, diff = pagure.lib.git.diff_pull_request(
- self.session,
- request=request,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- requestfolder=None,
- with_diff=True
- )
- self.assertEqual(len(diff_commits), 3)
- # Check that the PR has its PR refs
- # we don't know the task id but we'll give it 30 sec to finish
- cnt = 0
- repo = PagureRepo(gitrepo)
- while 1:
- if 'refs/pull/1/head' in list(repo.listall_references()):
- break
- cnt += 1
- if cnt == 60:
- break
- time.sleep(0.5)
- self.assertTrue(cnt < 60)
- pr_ref = repo.lookup_reference('refs/pull/1/head')
- commit2 = pr_ref.get_object()
- self.assertEqual(
- commit2.oid.hex,
- diff_commits[0].oid.hex
- )
- self.assertNotEqual(
- commit.oid.hex,
- commit2.oid.hex,
- )
- def test_two_diff_pull_request_sequentially(self):
- """ Test calling pagure.lib.git.diff_pull_request twice returns
- the same data
- """
- gitrepo = os.path.join(self.path, 'repos', 'test.git')
- gitrepo2 = os.path.join(
- self.path, 'repos', 'forks', 'pingou', 'test.git')
- request = pagure.lib.search_pull_requests(
- self.session, requestid=1, project_id=1)
- # Get the diff corresponding to the PR and check its ref
- diff_commits, diff = pagure.lib.git.diff_pull_request(
- self.session,
- request=request,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- requestfolder=None,
- with_diff=True
- )
- self.assertEqual(len(diff_commits), 2)
- # Check that the PR has its PR refs
- # we don't know the task id but we'll give it 30 sec to finish
- cnt = 0
- repo = PagureRepo(gitrepo)
- while 1:
- if 'refs/pull/1/head' in list(repo.listall_references()):
- break
- cnt += 1
- if cnt == 60:
- break
- time.sleep(0.5)
- self.assertTrue(cnt < 60)
- pr_ref = repo.lookup_reference('refs/pull/1/head')
- commit = pr_ref.get_object()
- self.assertEqual(
- commit.oid.hex,
- diff_commits[0].oid.hex
- )
- # Run diff_pull_request a second time
- diff_commits2, diff = pagure.lib.git.diff_pull_request(
- self.session,
- request=request,
- repo_obj=PagureRepo(gitrepo2),
- orig_repo=PagureRepo(gitrepo),
- requestfolder=None,
- with_diff=True
- )
- self.assertEqual(len(diff_commits2), 2)
- self.assertEqual(
- [d.oid.hex for d in diff_commits2],
- [d.oid.hex for d in diff_commits])
- # Check that the PR has its PR refs
- # we don't know the task id but we'll give it 30 sec to finish
- cnt = 0
- repo = PagureRepo(gitrepo)
- while 1:
- if 'refs/pull/1/head' in list(repo.listall_references()):
- break
- cnt += 1
- if cnt == 60:
- break
- time.sleep(0.5)
- self.assertTrue(cnt < 60)
- pr_ref = repo.lookup_reference('refs/pull/1/head')
- commit2 = pr_ref.get_object()
- self.assertEqual(
- commit2.oid.hex,
- diff_commits[0].oid.hex
- )
- self.assertEqual(
- commit.oid.hex,
- commit2.oid.hex
- )
- if __name__ == '__main__':
- unittest.main(verbosity=2)
|