Show More
@@ -108,13 +108,12 b' class TestCompareController(TestControll' | |||||
108 | response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) |
|
108 | response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) | |
109 | response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) |
|
109 | response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) | |
110 | ## files |
|
110 | ## files | |
111 | response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2)) |
|
111 | response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) | |
112 |
|
112 | |||
113 | finally: |
|
113 | finally: | |
114 | RepoModel().delete(r2_id) |
|
114 | RepoModel().delete(r2_id) | |
115 | RepoModel().delete(r1_id) |
|
115 | RepoModel().delete(r1_id) | |
116 |
|
116 | |||
117 |
|
||||
118 | def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): |
|
117 | def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): | |
119 | self.log_user() |
|
118 | self.log_user() | |
120 |
|
119 | |||
@@ -166,7 +165,7 b' class TestCompareController(TestControll' | |||||
166 | response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) |
|
165 | response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) | |
167 | response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) |
|
166 | response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) | |
168 | ## files |
|
167 | ## files | |
169 | response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2)) |
|
168 | response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) | |
170 |
|
169 | |||
171 | finally: |
|
170 | finally: | |
172 | RepoModel().delete(r2_id) |
|
171 | RepoModel().delete(r2_id) |
General Comments 0
You need to be logged in to leave comments.
Login now