Mercurial > kallithea

comparison rhodecode/tests/functional/test_compare.py @ 3647:8a86836fad64 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more usage of fixture tools in tests
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 01 Apr 2013 23:45:25 +0200
parents aef5f5ce5ead
children dc4644865e8b
comparison
equal deleted inserted replaced
3646:63e49418a4cc 3647:8a86836fad64
50 Session().commit() 50 Session().commit()
51 Session.remove() 51 Session.remove()
52 52
53 def test_compare_forks_on_branch_extra_commits_hg(self): 53 def test_compare_forks_on_branch_extra_commits_hg(self):
54 self.log_user() 54 self.log_user()
55 repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg', 55 repo1 = fixture.create_repo('one', repo_type='hg',
56 description='diff-test', 56 repo_description='diff-test',
57 owner=TEST_USER_ADMIN_LOGIN) 57 cur_user=TEST_USER_ADMIN_LOGIN)
58 Session().commit()
59 self.r1_id = repo1.repo_id 58 self.r1_id = repo1.repo_id
60 #commit something ! 59 #commit something !
61 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', 60 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
62 message='commit1', vcs_type='hg', parent=None, newfile=True) 61 message='commit1', vcs_type='hg', parent=None, newfile=True)
63 62
100 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) 99 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
101 100
102 def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): 101 def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):
103 self.log_user() 102 self.log_user()
104 103
105 repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg', 104 repo1 = fixture.create_repo('one', repo_type='hg',
106 description='diff-test', 105 repo_description='diff-test',
107 owner=TEST_USER_ADMIN_LOGIN) 106 cur_user=TEST_USER_ADMIN_LOGIN)
108 Session().commit() 107
109 self.r1_id = repo1.repo_id 108 self.r1_id = repo1.repo_id
110 109
111 #commit something ! 110 #commit something !
112 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', 111 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
113 message='commit1', vcs_type='hg', parent=None, newfile=True) 112 message='commit1', vcs_type='hg', parent=None, newfile=True)
166 # cs4: x 165 # cs4: x
167 # cs5: 166 # cs5:
168 #make repo1, and cs1+cs2 167 #make repo1, and cs1+cs2
169 self.log_user() 168 self.log_user()
170 169
171 repo1 = RepoModel().create_repo(repo_name='repo1', repo_type='hg', 170 repo1 = fixture.create_repo('repo1', repo_type='hg',
172 description='diff-test', 171 repo_description='diff-test',
173 owner=TEST_USER_ADMIN_LOGIN) 172 cur_user=TEST_USER_ADMIN_LOGIN)
174 Session().commit()
175 self.r1_id = repo1.repo_id 173 self.r1_id = repo1.repo_id
176 174
177 #commit something ! 175 #commit something !
178 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', 176 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
179 message='commit1', vcs_type='hg', parent=None, 177 message='commit1', vcs_type='hg', parent=None,
194 message='commit6', vcs_type='hg', parent=cs4) 192 message='commit6', vcs_type='hg', parent=cs4)
195 193
196 response = self.app.get(url(controller='compare', action='index', 194 response = self.app.get(url(controller='compare', action='index',
197 repo_name=repo2.repo_name, 195 repo_name=repo2.repo_name,
198 org_ref_type="rev", 196 org_ref_type="rev",
199 org_ref=cs1.short_id, # parent of cs2, in repo2 197 org_ref=cs1.short_id, # parent of cs2, in repo2
200 other_repo=repo1.repo_name, 198 other_repo=repo1.repo_name,
201 other_ref_type="rev", 199 other_ref_type="rev",
202 other_ref=cs4.short_id, 200 other_ref=cs4.short_id,
203 merge='True', 201 merge='True',
204 )) 202 ))
228 # cs4: x 226 # cs4: x
229 # cs5: x 227 # cs5: x
230 # 228 #
231 #make repo1, and cs1+cs2 229 #make repo1, and cs1+cs2
232 self.log_user() 230 self.log_user()
233 repo1 = RepoModel().create_repo(repo_name='repo1', repo_type='hg', 231 repo1 = fixture.create_repo('repo1', repo_type='hg',
234 description='diff-test', 232 repo_description='diff-test',
235 owner=TEST_USER_ADMIN_LOGIN) 233 cur_user=TEST_USER_ADMIN_LOGIN)
236 Session().commit()
237 self.r1_id = repo1.repo_id 234 self.r1_id = repo1.repo_id
238 235
239 #commit something ! 236 #commit something !
240 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', 237 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
241 message='commit1', vcs_type='hg', parent=None, 238 message='commit1', vcs_type='hg', parent=None,
276 response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id)) 273 response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id))
277 ## files 274 ## files
278 response.mustcontain("""#C--826e8142e6ba">file1</a>""") 275 response.mustcontain("""#C--826e8142e6ba">file1</a>""")
279 276
280 def test_compare_cherry_pick_changeset_mixed_branches(self): 277 def test_compare_cherry_pick_changeset_mixed_branches(self):
281 """
282
283 """
284 pass 278 pass
285 #TODO write this tastecase 279 #TODO write this tastecase
286 280
287 def test_compare_remote_branches_hg(self): 281 def test_compare_remote_branches_hg(self):
288 self.log_user() 282 self.log_user()
314 response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK)) 308 response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))
315 309
316 def test_org_repo_new_commits_after_forking_simple_diff(self): 310 def test_org_repo_new_commits_after_forking_simple_diff(self):
317 self.log_user() 311 self.log_user()
318 312
319 repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg', 313 repo1 = fixture.create_repo('one', repo_type='hg',
320 description='diff-test', 314 repo_description='diff-test',
321 owner=TEST_USER_ADMIN_LOGIN) 315 cur_user=TEST_USER_ADMIN_LOGIN)
322 316
323 Session().commit()
324 self.r1_id = repo1.repo_id 317 self.r1_id = repo1.repo_id
325 r1_name = repo1.repo_name 318 r1_name = repo1.repo_name
326 319
327 #commit something initially ! 320 #commit something initially !
328 cs0 = ScmModel().create_node( 321 cs0 = ScmModel().create_node(
334 f_path='file1' 327 f_path='file1'
335 ) 328 )
336 Session().commit() 329 Session().commit()
337 self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id]) 330 self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id])
338 #fork the repo1 331 #fork the repo1
339 repo2 = RepoModel().create_repo(repo_name='one-fork', repo_type='hg', 332 repo2 = fixture.create_repo('one-fork', repo_type='hg',
340 description='compare-test', 333 repo_description='diff-test',
341 clone_uri=repo1.repo_full_path, 334 cur_user=TEST_USER_ADMIN_LOGIN,
342 owner=TEST_USER_ADMIN_LOGIN, fork_of='one') 335 clone_uri=repo1.repo_full_path,
336 fork_of='one')
343 Session().commit() 337 Session().commit()
344 self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id]) 338 self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id])
345 self.r2_id = repo2.repo_id 339 self.r2_id = repo2.repo_id
346 r2_name = repo2.repo_name 340 r2_name = repo2.repo_name
347 341