kallithea Changeset - cf6758771b9c

Changeset - cf6758771b9c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 8 years ago 2018-05-07 00:49:44
mads@kiilerich.com

tests: fix some incorrect test use of create_repo to create forks

This would create problems later when we start checking clone_uri.

1 file changed with 4 insertions and 10 deletions:

kallithea/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -270,328 +270,322 @@ class TestCompareController(TestControll @@
                 content='line1\n', message='commit1', vcs_type='hg',
                 parent=None, newfile=True)
         cs1 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\n', message='commit2', vcs_type='hg',
                 parent=cs0)
         # fork this repo
         repo2 = fixture.create_fork(u'repo1', u'repo1-fork')
         self.r2_id = repo2.repo_id
         # now make cs3-6
         cs2 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\n', message='commit3',
                 vcs_type='hg', parent=cs1)
         cs3 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\nline4\n', message='commit4',
                 vcs_type='hg', parent=cs2)
         cs4 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\nline4\nline5\n',
                 message='commit5', vcs_type='hg', parent=cs3)
         cs5 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\nline4\nline5\nline6\n',
                 message='commit6', vcs_type='hg', parent=cs4)
         response = self.app.get(url('compare_url',
                                     repo_name=repo2.repo_name,
                                     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_ref(repo1.repo_name, cs2.raw_id, 'commit3'))
         response.mustcontain(_commit_ref(repo1.repo_name, cs3.raw_id, 'commit4'))
         response.mustcontain(_commit_ref(repo1.repo_name, 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):
         pass
 #        repo1:
 #            cs0:
 #            cs1:
 #        repo1-fork- in which we will cherry pick bottom changesets
 #            cs0:
 #            cs1:
 #            cs2:
 #            cs3: x
 #            cs4: x
 #            cs5: x
+#
         # make repo1, and cs1+cs2
         self.log_user()
         repo1 = fixture.create_repo(u'repo1', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         # commit something !
         cs0 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\n', message='commit1', vcs_type='hg',
                 parent=None, newfile=True)
         cs1 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\n', message='commit2', vcs_type='hg',
                 parent=cs0)
         # fork this repo
         repo2 = fixture.create_fork(u'repo1', u'repo1-fork')
         self.r2_id = repo2.repo_id
         # now make cs3-6
         cs2 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\n', message='commit3',
                 vcs_type='hg', parent=cs1)
         cs3 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\nline4\n', message='commit4',
                 vcs_type='hg', parent=cs2)
         cs4 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\nline4\nline5\n',
                 message='commit5', vcs_type='hg', parent=cs3)
         cs5 = fixture.commit_change(repo1.repo_name, filename='file1',
                 content='line1\nline2\nline3\nline4\nline5\nline6\n',
                 message='commit6', vcs_type='hg', parent=cs4)
         response = self.app.get(url('compare_url',
                                     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_ref(repo1.repo_name, cs3.raw_id, 'commit4'))
         response.mustcontain(_commit_ref(repo1.repo_name, cs4.raw_id, 'commit5'))
         response.mustcontain(_commit_ref(repo1.repo_name, 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):
         self.log_user()
         repo2 = fixture.create_fork(HG_REPO, HG_FORK)
         self.r2_id = repo2.repo_id
         rev1 = '56349e29c2af'
         rev2 = '7d4bc8ec6be5'
         response = self.app.get(url('compare_url',
                                     repo_name=HG_REPO,
                                     org_ref_type="rev",
                                     org_ref_name=rev1,
                                     other_ref_type="rev",
                                     other_ref_name=rev2,
                                     other_repo=HG_FORK,
                                     merge='1',))
         response.mustcontain('%s@%s' % (HG_REPO, rev1))
         response.mustcontain('%s@%s' % (HG_FORK, rev2))
         ## outgoing changesets between those revisions
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_FORK))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_FORK))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_FORK, rev2))
         ## files
         response.mustcontain("""<a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>""")
         response.mustcontain("""<a href="#C--41b41c1f2796">vcs/backends/__init__.py</a>""")
         response.mustcontain("""<a href="#C--2f574d260608">vcs/backends/base.py</a>""")
     def test_compare_remote_branches_git(self):
         self.log_user()
         repo2 = fixture.create_fork(GIT_REPO, GIT_FORK)
         self.r2_id = repo2.repo_id
         rev1 = '102607b09cdd60e2793929c4f90478be29f85a17'
         rev2 = 'd7e0d30fbcae12c90680eb095a4f5f02505ce501'
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="rev",
                                     org_ref_name=rev1,
                                     other_ref_type="rev",
                                     other_ref_name=rev2,
                                     other_repo=GIT_FORK,
                                     merge='1',))
         response.mustcontain('%s@%s' % (GIT_REPO, rev1))
         response.mustcontain('%s@%s' % (GIT_FORK, rev2))
         ## outgoing changesets between those revisions
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/49d3fd156b6f7db46313fac355dca1a0b94a0017">r4:49d3fd156b6f</a>""" % (GIT_FORK))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/2d1028c054665b962fa3d307adfc923ddd528038">r5:2d1028c05466</a>""" % (GIT_FORK))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/d7e0d30fbcae12c90680eb095a4f5f02505ce501">r6:%s</a>""" % (GIT_FORK, rev2[:12]))
         ## files
         response.mustcontain("""<a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>""")
         response.mustcontain("""<a href="#C--41b41c1f2796">vcs/backends/__init__.py</a>""")
         response.mustcontain("""<a href="#C--2f574d260608">vcs/backends/base.py</a>""")
     def test_org_repo_new_commits_after_forking_simple_diff_hg(self):
         self.log_user()
         repo1 = fixture.create_repo(u'one', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         r1_name = repo1.repo_name
         cs0 = fixture.commit_change(repo=r1_name, filename='file1',
                 content='line1', message='commit1', vcs_type='hg', newfile=True)
         Session().commit()
         assert repo1.scm_instance.revisions == [cs0.raw_id]
         # fork the repo1
         repo2 = fixture.create_repo(u'one-fork', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN,
                                     clone_uri=repo1.repo_full_path,
                                     fork_of='one')
         repo2 = fixture.create_fork(r1_name, u'one-fork',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         Session().commit()
         assert repo2.scm_instance.revisions == [cs0.raw_id]
         self.r2_id = repo2.repo_id
         r2_name = repo2.repo_name
         cs1 = fixture.commit_change(repo=r2_name, filename='file1-fork',
                 content='file1-line1-from-fork', message='commit1-fork',
                 vcs_type='hg', parent=repo2.scm_instance[-1], newfile=True)
         cs2 = fixture.commit_change(repo=r2_name, filename='file2-fork',
                 content='file2-line1-from-fork', message='commit2-fork',
                 vcs_type='hg', parent=cs1, newfile=True)
         cs3 = fixture.commit_change(repo=r2_name, filename='file3-fork',
                 content='file3-line1-from-fork', message='commit3-fork',
                 vcs_type='hg', parent=cs2, newfile=True)
         # compare !
         rev1 = 'default'
         rev2 = 'default'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref_name=rev2,
                                     other_ref_type="branch",
                                     other_ref_name=rev1,
                                     other_repo=r1_name,
                                     merge='1',), status=404)
         response.mustcontain('Cannot show empty diff')
         cs0 = fixture.commit_change(repo=r1_name, filename='file2',
                 content='line1-added-after-fork', message='commit2-parent',
                 vcs_type='hg', parent=None, newfile=True)
         # compare !
         rev1 = 'default'
         rev2 = 'default'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref_name=rev2,
                                     other_ref_type="branch",
                                     other_ref_name=rev1,
                                     other_repo=r1_name,
                                     merge='1',
                                     ))
         response.mustcontain('%s@%s' % (r2_name, rev1))
         response.mustcontain('%s@%s' % (r1_name, rev2))
         response.mustcontain("""commit2-parent""")
         response.mustcontain("""1 file changed with 1 insertions and 0 deletions""")
         response.mustcontain("""line1-added-after-fork""")
     def test_org_repo_new_commits_after_forking_simple_diff_git(self):
         self.log_user()
         repo1 = fixture.create_repo(u'one-git', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         r1_name = repo1.repo_name
         cs0 = fixture.commit_change(repo=r1_name, filename='file1',
                 content='line1', message='commit1', vcs_type='git',
                 newfile=True)
         Session().commit()
         assert repo1.scm_instance.revisions == [cs0.raw_id]
         # fork the repo1
         repo2 = fixture.create_repo(u'one-git-fork', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN,
                                     clone_uri=repo1.repo_full_path,
                                     fork_of='one-git')
         repo2 = fixture.create_fork(r1_name, u'one-git-fork',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         Session().commit()
         assert repo2.scm_instance.revisions == [cs0.raw_id]
         self.r2_id = repo2.repo_id
         r2_name = repo2.repo_name
         cs1 = fixture.commit_change(repo=r2_name, filename='file1-fork',
                 content='file1-line1-from-fork', message='commit1-fork',
                 vcs_type='git', parent=repo2.scm_instance[-1], newfile=True)
         cs2 = fixture.commit_change(repo=r2_name, filename='file2-fork',
                 content='file2-line1-from-fork', message='commit2-fork',
                 vcs_type='git', parent=cs1, newfile=True)
         cs3 = fixture.commit_change(repo=r2_name, filename='file3-fork',
                 content='file3-line1-from-fork', message='commit3-fork',
                 vcs_type='git', parent=cs2, newfile=True)
         # compare !
         rev1 = 'master'
         rev2 = 'master'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref_name=rev1,
                                     other_ref_type="branch",
                                     other_ref_name=rev2,
                                     other_repo=r1_name,
                                     merge='1',), status=404)
         response.mustcontain('Cannot show empty diff')
         cs0 = fixture.commit_change(repo=r1_name, filename='file2',
                 content='line1-added-after-fork', message='commit2-parent',
                 vcs_type='git', parent=None, newfile=True)
         # compare !
         rev1 = 'master'
         rev2 = 'master'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref_name=rev1,
                                     other_ref_type="branch",
                                     other_ref_name=rev2,
                                     other_repo=r1_name,
                                     merge='1',
                                     ))
         response.mustcontain('%s@%s' % (r2_name, rev1))
         response.mustcontain('%s@%s' % (r1_name, rev2))
         response.mustcontain("""commit2-parent""")
         response.mustcontain("""1 file changed with 1 insertions and 0 deletions""")
         response.mustcontain("""line1-added-after-fork""")

0 comments (0 inline, 0 general)