Mercurial > kallithea
diff rhodecode/tests/functional/test_compare_local.py @ 4116:ffd45b185016 rhodecode-2.2.5-gpl
Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
This imports changes between changesets 21af6c4eab3d and 6177597791c2 in
RhodeCode's original repository, including only changes to Python files and HTML.
RhodeCode clearly licensed its changes to these files under GPLv3
in their /LICENSE file, which states the following:
The Python code and integrated HTML are licensed under the GPLv3 license.
(See:
https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE
or
http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE
for an online copy of that LICENSE file)
Conservancy reviewed these changes and confirmed that they can be licensed as
a whole to the Kallithea project under GPLv3-only.
While some of the contents committed herein are clearly licensed
GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the
statement above from RhodeCode indicates that they intend GPLv3-only as their
license, per GPLv3ยง14 and other relevant sections of GPLv3.
| author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
|---|---|
| date | Wed, 02 Jul 2014 19:03:13 -0400 |
| parents | d7488551578e |
| children | 7e5f8c12a3fc |
line wrap: on
line diff
--- a/rhodecode/tests/functional/test_compare_local.py Wed Jul 02 19:03:10 2014 -0400 +++ b/rhodecode/tests/functional/test_compare_local.py Wed Jul 02 19:03:13 2014 -0400 @@ -1,10 +1,5 @@ +# -*- coding: utf-8 -*- from rhodecode.tests import * -from rhodecode.model.repo import RepoModel -from rhodecode.model.meta import Session -from rhodecode.model.db import Repository -from rhodecode.model.scm import ScmModel -from rhodecode.lib.vcs.backends.base import EmptyChangeset - class TestCompareController(TestController): @@ -12,14 +7,15 @@ self.log_user() tag1 = 'v0.1.2' tag2 = 'v0.1.3' - response = self.app.get(url(controller='compare', action='index', + response = self.app.get(url('compare_url', repo_name=HG_REPO, org_ref_type="tag", org_ref=tag1, other_ref_type="tag", other_ref=tag2, ), status=200) - response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, tag1, HG_REPO, tag2)) + response.mustcontain('%s@%s' % (HG_REPO, tag1)) + response.mustcontain('%s@%s' % (HG_REPO, tag2)) ## outgoing changesets between tags response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO) @@ -49,14 +45,15 @@ self.log_user() tag1 = 'v0.1.2' tag2 = 'v0.1.3' - response = self.app.get(url(controller='compare', action='index', + response = self.app.get(url('compare_url', repo_name=GIT_REPO, org_ref_type="tag", org_ref=tag1, other_ref_type="tag", other_ref=tag2, ), status=200) - response.mustcontain('%s@%s -> %s@%s' % (GIT_REPO, tag1, GIT_REPO, tag2)) + response.mustcontain('%s@%s' % (GIT_REPO, tag1)) + response.mustcontain('%s@%s' % (GIT_REPO, tag2)) ## outgoing changesets between tags response.mustcontain('''<a href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO) @@ -84,7 +81,7 @@ def test_index_branch_hg(self): self.log_user() - response = self.app.get(url(controller='compare', action='index', + response = self.app.get(url('compare_url', repo_name=HG_REPO, org_ref_type="branch", org_ref='default', @@ -92,14 +89,15 @@ other_ref='default', )) - response.mustcontain('%s@default -> %s@default' % (HG_REPO, HG_REPO)) + response.mustcontain('%s@default' % (HG_REPO)) + response.mustcontain('%s@default' % (HG_REPO)) # branch are equal response.mustcontain('<span class="empty_data">No files</span>') response.mustcontain('<span class="empty_data">No changesets</span>') def test_index_branch_git(self): self.log_user() - response = self.app.get(url(controller='compare', action='index', + response = self.app.get(url('compare_url', repo_name=GIT_REPO, org_ref_type="branch", org_ref='master', @@ -107,7 +105,8 @@ other_ref='master', )) - response.mustcontain('%s@master -> %s@master' % (GIT_REPO, GIT_REPO)) + response.mustcontain('%s@master' % (GIT_REPO)) + response.mustcontain('%s@master' % (GIT_REPO)) # branch are equal response.mustcontain('<span class="empty_data">No files</span>') response.mustcontain('<span class="empty_data">No changesets</span>') @@ -117,14 +116,16 @@ rev1 = 'b986218ba1c9' rev2 = '3d8f361e72ab' - response = self.app.get(url(controller='compare', action='index', + response = self.app.get(url('compare_url', repo_name=HG_REPO, org_ref_type="rev", org_ref=rev1, other_ref_type="rev", other_ref=rev2, )) - response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_REPO, rev2)) + response.mustcontain('%s@%s' % (HG_REPO, rev1)) + response.mustcontain('%s@%s' % (HG_REPO, rev2)) + ## outgoing changesets between those revisions response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2)) @@ -137,14 +138,16 @@ rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3' rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557' - response = self.app.get(url(controller='compare', action='index', + response = self.app.get(url('compare_url', repo_name=GIT_REPO, org_ref_type="rev", org_ref=rev1, other_ref_type="rev", other_ref=rev2, )) - response.mustcontain('%s@%s -> %s@%s' % (GIT_REPO, rev1, GIT_REPO, rev2)) + response.mustcontain('%s@%s' % (GIT_REPO, rev1)) + response.mustcontain('%s@%s' % (GIT_REPO, rev2)) + ## outgoing changesets between those revisions response.mustcontain("""<a href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12])) response.mustcontain('1 file changed with 7 insertions and 0 deletions')