Mercurial > kallithea
comparison rhodecode/tests/functional/test_compare.py @ 3026:ff9e0cbfcd7f beta
fixed tests for databases that have FKs. Thank you sqlite...
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 24 Nov 2012 02:12:48 +0100 |
parents | c2a206162062 |
children | 685ebc84c2e9 |
comparison
equal
deleted
inserted
replaced
3025:f61adead3520 | 3026:ff9e0cbfcd7f |
---|---|
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#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2)) |
112 | 112 |
113 finally: | 113 finally: |
114 RepoModel().delete(r2_id) | |
114 RepoModel().delete(r1_id) | 115 RepoModel().delete(r1_id) |
115 RepoModel().delete(r2_id) | 116 |
116 | 117 |
117 def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): | 118 def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): |
118 self.log_user() | 119 self.log_user() |
119 | 120 |
120 repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg', | 121 repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg', |
166 response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) | 167 response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) |
167 ## files | 168 ## files |
168 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2)) | 169 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2)) |
169 | 170 |
170 finally: | 171 finally: |
172 RepoModel().delete(r2_id) | |
171 RepoModel().delete(r1_id) | 173 RepoModel().delete(r1_id) |
172 RepoModel().delete(r2_id) | |
173 | 174 |
174 | 175 |
175 # def test_compare_remote_repos_remote_flag_off(self): | 176 # def test_compare_remote_repos_remote_flag_off(self): |
176 # self.log_user() | 177 # self.log_user() |
177 # _fork_repo(HG_FORK, 'hg') | 178 # _fork_repo(HG_FORK, 'hg') |