Files
@ e1ab82613133
Branch filter:
Location: kallithea/kallithea/tests/functional/test_pullrequests.py
e1ab82613133
16.2 KiB
text/x-python
backend: replace Pylons with TurboGears2
Replace the no-longer-supported Pylons application framework by TurboGears2
which is largely compatible/similar to Pylons.
Some interesting history is described at:
https://en.wikipedia.org/wiki/TurboGears
Changes by Dominik Ruf:
- fix sql config in test.ini
Changes by Thomas De Schampheleire:
- set-up of test suite
- tests: 'fix' repo archival test failure
Between Pylons and TurboGears2, there seems to be a small difference in the
headers sent for repository archive files, related to character encoding.
It is assumed that this difference is not important, and that the test
should just align with reality.
- remove need to import helpers/app_globals in lib
TurboGears2 by default expects helpers and app_globals to be available
in lib. For this reason kallithea/lib/__init__.py was originally changed
to include those files. However, this triggered several types of
circular import problems. If module A imported something from lib (e.g.
lib.annotate), and lib.helpers imported (possibly indirectly) module A,
then there was a circular import. Fix this by overruling the relevant
method of tg AppConfig, which is also hinted in the TurboGears2 code.
Hereby, the include of something from lib does not automatically import
helpers, greatly reducing the chances of circular import problems.
- make sure HTTP error '400' uses the custom error pages
TurboGears2 does not by default handle HTTP status code
'400 (Bad Request)' via the custom error page handling, causing a
standard non-styled error page.
- disable transaction manager
Kallithea currently handles its own transactions and does not need the
TurboGears2 transaction manager. However, TurboGears2 tries to enable it
by default and fails, throwing an error during application initialization.
The error itself seemed to be harmless for normal application functioning,
but was nevertheless confusing.
- add backlash as required dependency: backlash is meant as the WebError
replacement in TurboGears2 (originally WebError is part of Pylons). When
debug==true, it provides an interactive debugger in the browser. When
debug==false, backlash is necessary to show backtraces on the console.
- misc fixes
Replace the no-longer-supported Pylons application framework by TurboGears2
which is largely compatible/similar to Pylons.
Some interesting history is described at:
https://en.wikipedia.org/wiki/TurboGears
Changes by Dominik Ruf:
- fix sql config in test.ini
Changes by Thomas De Schampheleire:
- set-up of test suite
- tests: 'fix' repo archival test failure
Between Pylons and TurboGears2, there seems to be a small difference in the
headers sent for repository archive files, related to character encoding.
It is assumed that this difference is not important, and that the test
should just align with reality.
- remove need to import helpers/app_globals in lib
TurboGears2 by default expects helpers and app_globals to be available
in lib. For this reason kallithea/lib/__init__.py was originally changed
to include those files. However, this triggered several types of
circular import problems. If module A imported something from lib (e.g.
lib.annotate), and lib.helpers imported (possibly indirectly) module A,
then there was a circular import. Fix this by overruling the relevant
method of tg AppConfig, which is also hinted in the TurboGears2 code.
Hereby, the include of something from lib does not automatically import
helpers, greatly reducing the chances of circular import problems.
- make sure HTTP error '400' uses the custom error pages
TurboGears2 does not by default handle HTTP status code
'400 (Bad Request)' via the custom error page handling, causing a
standard non-styled error page.
- disable transaction manager
Kallithea currently handles its own transactions and does not need the
TurboGears2 transaction manager. However, TurboGears2 tries to enable it
by default and fails, throwing an error during application initialization.
The error itself seemed to be harmless for normal application functioning,
but was nevertheless confusing.
- add backlash as required dependency: backlash is meant as the WebError
replacement in TurboGears2 (originally WebError is part of Pylons). When
debug==true, it provides an interactive debugger in the browser. When
debug==false, backlash is necessary to show backtraces on the console.
- misc fixes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | import re
import pytest
from tg.util.webtest import test_context
from kallithea.tests.base import *
from kallithea.tests.fixture import Fixture
from kallithea.model.db import User
from kallithea.model.meta import Session
from kallithea.controllers.pullrequests import PullrequestsController
fixture = Fixture()
class TestPullrequestsController(TestController):
def test_index(self):
self.log_user()
response = self.app.get(url(controller='pullrequests', action='index',
repo_name=HG_REPO))
def test_create_trivial(self):
self.log_user()
response = self.app.post(url(controller='pullrequests', action='create',
repo_name=HG_REPO),
{'org_repo': HG_REPO,
'org_ref': 'branch:stable:4f7e2131323e0749a740c0a56ab68ae9269c562a',
'other_repo': HG_REPO,
'other_ref': 'branch:default:96507bd11ecc815ebc6270fdf6db110928c09c1e',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'_authentication_token': self.authentication_token(),
},
status=302)
response = response.follow()
assert response.status == '200 OK'
response.mustcontain('Successfully opened new pull request')
response.mustcontain('No additional changesets found for iterating on this pull request')
response.mustcontain('href="/vcs_test_hg/changeset/4f7e2131323e0749a740c0a56ab68ae9269c562a"')
def test_available(self):
self.log_user()
response = self.app.post(url(controller='pullrequests', action='create',
repo_name=HG_REPO),
{'org_repo': HG_REPO,
'org_ref': 'rev:94f45ed825a1:94f45ed825a113e61af7e141f44ca578374abef0',
'other_repo': HG_REPO,
'other_ref': 'branch:default:96507bd11ecc815ebc6270fdf6db110928c09c1e',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'_authentication_token': self.authentication_token(),
},
status=302)
response = response.follow()
assert response.status == '200 OK'
response.mustcontain(no='No additional changesets found for iterating on this pull request')
response.mustcontain('The following additional changes are available on stable:')
response.mustcontain('<input id="updaterev_4f7e2131323e0749a740c0a56ab68ae9269c562a" name="updaterev" type="radio" value="4f7e2131323e0749a740c0a56ab68ae9269c562a" />')
response.mustcontain('href="/vcs_test_hg/changeset/4f7e2131323e0749a740c0a56ab68ae9269c562a"') # as update
def test_range(self):
self.log_user()
response = self.app.post(url(controller='pullrequests', action='create',
repo_name=HG_REPO),
{'org_repo': HG_REPO,
'org_ref': 'branch:stable:4f7e2131323e0749a740c0a56ab68ae9269c562a',
'other_repo': HG_REPO,
'other_ref': 'rev:94f45ed825a1:94f45ed825a113e61af7e141f44ca578374abef0',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'_authentication_token': self.authentication_token(),
},
status=302)
response = response.follow()
assert response.status == '200 OK'
response.mustcontain('No additional changesets found for iterating on this pull request')
response.mustcontain('href="/vcs_test_hg/changeset/4f7e2131323e0749a740c0a56ab68ae9269c562a"')
def test_update_reviewers(self):
self.log_user()
regular_user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
regular_user2 = User.get_by_username(TEST_USER_REGULAR2_LOGIN)
admin_user = User.get_by_username(TEST_USER_ADMIN_LOGIN)
# create initial PR
response = self.app.post(url(controller='pullrequests', action='create',
repo_name=HG_REPO),
{'org_repo': HG_REPO,
'org_ref': 'rev:94f45ed825a1:94f45ed825a113e61af7e141f44ca578374abef0',
'other_repo': HG_REPO,
'other_ref': 'branch:default:96507bd11ecc815ebc6270fdf6db110928c09c1e',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'_authentication_token': self.authentication_token(),
},
status=302)
pull_request1_id = re.search('/pull-request/(\d+)/', response.location).group(1)
assert response.location == 'http://localhost/%s/pull-request/%s/_/stable' % (HG_REPO, pull_request1_id)
# create new iteration
response = self.app.post(url(controller='pullrequests', action='post',
repo_name=HG_REPO, pull_request_id=pull_request1_id),
{
'updaterev': '4f7e2131323e0749a740c0a56ab68ae9269c562a',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'owner': TEST_USER_ADMIN_LOGIN,
'_authentication_token': self.authentication_token(),
'review_members': [regular_user.user_id],
},
status=302)
pull_request2_id = re.search('/pull-request/(\d+)/', response.location).group(1)
assert pull_request2_id != pull_request1_id
assert response.location == 'http://localhost/%s/pull-request/%s/_/stable' % (HG_REPO, pull_request2_id)
response = response.follow()
# verify reviewer was added
response.mustcontain('<input type="hidden" value="%s" name="review_members" />' % regular_user.user_id)
# update without creating new iteration
response = self.app.post(url(controller='pullrequests', action='post',
repo_name=HG_REPO, pull_request_id=pull_request2_id),
{
'pullrequest_title': 'Title',
'pullrequest_desc': 'description',
'owner': TEST_USER_ADMIN_LOGIN,
'_authentication_token': self.authentication_token(),
'org_review_members': [admin_user.user_id], # fake - just to get some 'meanwhile' warning ... but it is also added ...
'review_members': [regular_user2.user_id, admin_user.user_id],
},
status=302)
assert response.location == 'http://localhost/%s/pull-request/%s/_/stable' % (HG_REPO, pull_request2_id)
response = response.follow()
# verify reviewers were added / removed
response.mustcontain('Meanwhile, the following reviewers have been added: test_regular')
response.mustcontain('Meanwhile, the following reviewers have been removed: test_admin')
response.mustcontain('<input type="hidden" value="%s" name="review_members" />' % regular_user.user_id)
response.mustcontain('<input type="hidden" value="%s" name="review_members" />' % regular_user2.user_id)
response.mustcontain(no='<input type="hidden" value="%s" name="review_members" />' % admin_user.user_id)
def test_update_with_invalid_reviewer(self):
invalid_user_id = 99999
self.log_user()
# create a valid pull request
response = self.app.post(url(controller='pullrequests', action='create',
repo_name=HG_REPO),
{
'org_repo': HG_REPO,
'org_ref': 'rev:94f45ed825a1:94f45ed825a113e61af7e141f44ca578374abef0',
'other_repo': HG_REPO,
'other_ref': 'branch:default:96507bd11ecc815ebc6270fdf6db110928c09c1e',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'_authentication_token': self.authentication_token(),
},
status=302)
# location is of the form:
# http://localhost/vcs_test_hg/pull-request/54/_/title
m = re.search('/pull-request/(\d+)/', response.location)
assert m != None
pull_request_id = m.group(1)
# update it
response = self.app.post(url(controller='pullrequests', action='post',
repo_name=HG_REPO, pull_request_id=pull_request_id),
{
'updaterev': '4f7e2131323e0749a740c0a56ab68ae9269c562a',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'owner': TEST_USER_ADMIN_LOGIN,
'_authentication_token': self.authentication_token(),
'review_members': [str(invalid_user_id)],
},
status=400)
response.mustcontain('Invalid reviewer "%s" specified' % invalid_user_id)
def test_edit_with_invalid_reviewer(self):
invalid_user_id = 99999
self.log_user()
# create a valid pull request
response = self.app.post(url(controller='pullrequests', action='create',
repo_name=HG_REPO),
{
'org_repo': HG_REPO,
'org_ref': 'branch:stable:4f7e2131323e0749a740c0a56ab68ae9269c562a',
'other_repo': HG_REPO,
'other_ref': 'branch:default:96507bd11ecc815ebc6270fdf6db110928c09c1e',
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'_authentication_token': self.authentication_token(),
},
status=302)
# location is of the form:
# http://localhost/vcs_test_hg/pull-request/54/_/title
m = re.search('/pull-request/(\d+)/', response.location)
assert m != None
pull_request_id = m.group(1)
# edit it
response = self.app.post(url(controller='pullrequests', action='post',
repo_name=HG_REPO, pull_request_id=pull_request_id),
{
'pullrequest_title': 'title',
'pullrequest_desc': 'description',
'owner': TEST_USER_ADMIN_LOGIN,
'_authentication_token': self.authentication_token(),
'review_members': [str(invalid_user_id)],
},
status=400)
response.mustcontain('Invalid reviewer "%s" specified' % invalid_user_id)
@pytest.mark.usefixtures("test_context_fixture") # apply fixture for all test methods
class TestPullrequestsGetRepoRefs(TestController):
def setup_method(self, method):
self.repo_name = u'main'
repo = fixture.create_repo(self.repo_name, repo_type='hg')
self.repo_scm_instance = repo.scm_instance
Session.commit()
self.c = PullrequestsController()
def teardown_method(self, method):
fixture.destroy_repo(u'main')
Session.commit()
Session.remove()
def test_repo_refs_empty_repo(self):
# empty repo with no commits, no branches, no bookmarks, just one tag
refs, default = self.c._get_repo_refs(self.repo_scm_instance)
assert default == 'tag:null:0000000000000000000000000000000000000000'
def test_repo_refs_one_commit_no_hints(self):
cs0 = fixture.commit_change(self.repo_name, filename='file1',
content='line1\n', message='commit1', vcs_type='hg',
parent=None, newfile=True)
refs, default = self.c._get_repo_refs(self.repo_scm_instance)
assert default == 'branch:default:%s' % cs0.raw_id
assert ([('branch:default:%s' % cs0.raw_id, 'default (current tip)')],
'Branches') in refs
def test_repo_refs_one_commit_rev_hint(self):
cs0 = fixture.commit_change(self.repo_name, filename='file1',
content='line1\n', message='commit1', vcs_type='hg',
parent=None, newfile=True)
refs, default = self.c._get_repo_refs(self.repo_scm_instance, rev=cs0.raw_id)
expected = 'branch:default:%s' % cs0.raw_id
assert default == expected
assert ([(expected, 'default (current tip)')], 'Branches') in refs
def test_repo_refs_two_commits_no_hints(self):
cs0 = fixture.commit_change(self.repo_name, filename='file1',
content='line1\n', message='commit1', vcs_type='hg',
parent=None, newfile=True)
cs1 = fixture.commit_change(self.repo_name, filename='file2',
content='line2\n', message='commit2', vcs_type='hg',
parent=None, newfile=True)
refs, default = self.c._get_repo_refs(self.repo_scm_instance)
expected = 'branch:default:%s' % cs1.raw_id
assert default == expected
assert ([(expected, 'default (current tip)')], 'Branches') in refs
def test_repo_refs_two_commits_rev_hints(self):
cs0 = fixture.commit_change(self.repo_name, filename='file1',
content='line1\n', message='commit1', vcs_type='hg',
parent=None, newfile=True)
cs1 = fixture.commit_change(self.repo_name, filename='file2',
content='line2\n', message='commit2', vcs_type='hg',
parent=None, newfile=True)
refs, default = self.c._get_repo_refs(self.repo_scm_instance, rev=cs0.raw_id)
expected = 'rev:%s:%s' % (cs0.raw_id, cs0.raw_id)
assert default == expected
assert ([(expected, 'Changeset: %s' % cs0.raw_id[0:12])], 'Special') in refs
assert ([('branch:default:%s' % cs1.raw_id, 'default (current tip)')], 'Branches') in refs
refs, default = self.c._get_repo_refs(self.repo_scm_instance, rev=cs1.raw_id)
expected = 'branch:default:%s' % cs1.raw_id
assert default == expected
assert ([(expected, 'default (current tip)')], 'Branches') in refs
def test_repo_refs_two_commits_branch_hint(self):
cs0 = fixture.commit_change(self.repo_name, filename='file1',
content='line1\n', message='commit1', vcs_type='hg',
parent=None, newfile=True)
cs1 = fixture.commit_change(self.repo_name, filename='file2',
content='line2\n', message='commit2', vcs_type='hg',
parent=None, newfile=True)
refs, default = self.c._get_repo_refs(self.repo_scm_instance, branch='default')
expected = 'branch:default:%s' % cs1.raw_id
assert default == expected
assert ([(expected, 'default (current tip)')], 'Branches') in refs
def test_repo_refs_one_branch_no_hints(self):
cs0 = fixture.commit_change(self.repo_name, filename='file1',
content='line1\n', message='commit1', vcs_type='hg',
parent=None, newfile=True)
# TODO
|