Changeset - 01c216ba7e37
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 8 years ago 2017-08-28 05:25:39
mads@kiilerich.com
tests: fix test failure after 3c1cdd1c1736

The hashes that apparently only were used for toggling commit messages were
also used by tests.

This change could seem to remove some test coverage, but the removed sha check
is covered by the changeset_hash check a few lines later.
1 file changed with 16 insertions and 16 deletions:
kallithea/tests/functional/test_compare.py
16
16
0 comments (0 inline, 0 general)
kallithea/tests/functional/test_compare.py
➞
Show inline comments
 
# -*- coding: utf-8 -*-
 
from kallithea.tests.base import *
 
from kallithea.model.repo import RepoModel
 
from kallithea.model.meta import Session
 
from kallithea.tests.fixture import Fixture
 

			




	
	
	
		
 
fixture = Fixture()

			




	
	
	
		
 

			




	
	
	
		
 
def _commit_div(sha, msg):

			




	
	
	
		
 
    return """<div id="C-%s" class="message">%s</div>""" % (sha, msg)

			




	
	
	
		
 
def _commit_ref(sha, msg):

			




	
	
	
		
 
    return '''<div class="message">%s</div>''' % msg

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class TestCompareController(TestController):

			




	
	
	
		
 

			




	
	
	
		
 
    def setup_method(self, method):

			




	
	
	
		
 
        self.r1_id = None

			




	
	
	
		
 
        self.r2_id = None

			




	
	
	
		
 

			




	
	
	
		
 
    def teardown_method(self, method):

			




	
	
	
		
 
        if self.r2_id:

			




	
	
	
		
 
            RepoModel().delete(self.r2_id)

			




	
	
	
		
 
        if self.r1_id:

			




	
	
		
 
@@ -56,26 +56,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        repo1 = fixture.create_repo(u'one-git', repo_type='git',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
		
 
@@ -107,26 +107,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incoming_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo(u'one', repo_type='hg',

			




	
	
		
 
@@ -166,26 +166,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incoming_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo(u'one-git', repo_type='git',

			




	
	
		
 
@@ -225,26 +225,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changesets_from_bottom(self):

			




	
	
	
		
 

			




	
	
	
		
 
#        repo1:

			




	
	
	
		
 
#            cs0:

			




	
	
		
 
@@ -293,27 +293,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=cs1.short_id,  # parent of cs2, in repo2

			




	
	
	
		
 
                                    other_repo=repo1.repo_name,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=cs4.short_id,

			




	
	
	
		
 
                                    merge='True',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, cs4.short_id))

			




	
	
	
		
 
        response.mustcontain("""Showing 3 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs4.raw_id, 'commit5'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs4.raw_id, 'commit5'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo1.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changesets_from_top(self):

			




	
	
	
		
 
#        repo1:

			




	
	
	
		
 
#            cs0:

			




	
	
	
		
 
#            cs1:

			




	
	
	
		
 
#        repo1-fork- in which we will cherry pick bottom changesets

			




	
	
		
 
@@ -359,27 +359,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=cs2.short_id, # parent of cs3, not in repo2

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=cs5.short_id,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, cs2.short_id))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, cs5.short_id))

			




	
	
	
		
 
        response.mustcontain("""Showing 3 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs4.raw_id, 'commit5'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs5.raw_id, 'commit6'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs4.raw_id, 'commit5'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs5.raw_id, 'commit6'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changeset_mixed_branches(self):

			




	
	
	
		
 
        #TODO: write this

			




	
	
	
		
 
        assert 1

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_remote_branches_hg(self):

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.