diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py --- a/rhodecode/tests/functional/test_compare.py +++ b/rhodecode/tests/functional/test_compare.py @@ -89,16 +89,16 @@ class TestCompareController(TestControll rev1 = 'default' rev2 = 'default' response = self.app.get(url(controller='compare', action='index', - repo_name=repo2.repo_name, + repo_name=repo1.repo_name, org_ref_type="branch", - org_ref=rev1, - other_repo=repo1.repo_name, + org_ref=rev2, + other_repo=repo2.repo_name, other_ref_type="branch", - other_ref=rev2, + other_ref=rev1, )) try: - response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2)) + response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1)) response.mustcontain("""Showing 2 commits""") response.mustcontain("""1 file changed with 2 insertions and 0 deletions""") @@ -108,9 +108,9 @@ class TestCompareController(TestControll response.mustcontain("""r1:%s""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) response.mustcontain("""r2:%s""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) ## files - response.mustcontain("""file1""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""file1""" % (repo1.repo_name, rev2, rev1, repo2.repo_name)) #swap - response.mustcontain("""[swap]""" % (repo1.repo_name, rev1, rev2, repo2.repo_name)) + response.mustcontain("""[swap]""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) finally: RepoModel().delete(r2_id) RepoModel().delete(r1_id) @@ -147,16 +147,16 @@ class TestCompareController(TestControll rev1 = 'default' rev2 = 'default' response = self.app.get(url(controller='compare', action='index', - repo_name=repo2.repo_name, + repo_name=repo1.repo_name, org_ref_type="branch", - org_ref=rev1, - other_repo=repo1.repo_name, + org_ref=rev2, + other_repo=repo2.repo_name, other_ref_type="branch", - other_ref=rev2, + other_ref=rev1, )) try: - response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2)) + response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1)) response.mustcontain("""Showing 2 commits""") response.mustcontain("""1 file changed with 2 insertions and 0 deletions""") @@ -166,9 +166,9 @@ class TestCompareController(TestControll response.mustcontain("""r1:%s""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) response.mustcontain("""r2:%s""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) ## files - response.mustcontain("""file1""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""file1""" % (repo1.repo_name, rev2, rev1, repo2.repo_name)) #swap - response.mustcontain("""[swap]""" % (repo1.repo_name, rev1, rev2, repo2.repo_name)) + response.mustcontain("""[swap]""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) finally: RepoModel().delete(r2_id) RepoModel().delete(r1_id)