kallithea Changeset - 01c216ba7e37

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

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -3,14 +3,14 @@ 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
@@ @@ -62,14 +62,14 @@ class TestCompareController(TestControll @@
         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
@@ @@ -113,14 +113,14 @@ class TestCompareController(TestControll @@
         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
@@ @@ -172,14 +172,14 @@ class TestCompareController(TestControll @@
         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
@@ @@ -231,14 +231,14 @@ class TestCompareController(TestControll @@
         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
@@ @@ -299,15 +299,15 @@ class TestCompareController(TestControll @@
                                     ))
         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>""")
@@ @@ -365,15 +365,15 @@ class TestCompareController(TestControll @@
         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>""")

0 comments (0 inline, 0 general)