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

@@ @@ -450,29 +450,26 @@ class TestCompareController(TestControll @@
         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)
@@ @@ -526,29 +523,26 @@ class TestCompareController(TestControll @@
                                     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',

0 comments (0 inline, 0 general)