From ea4cb9d4ae61adfb1cc9d6d0b48b9a43f67db9b4 Mon Sep 17 00:00:00 2001 From: lisaq Date: Wed, 17 Aug 2016 17:58:11 +0200 Subject: [PATCH] tests: fixes #4168 removing git xfails in pr and vcs commit tests --- rhodecode/tests/functional/test_pullrequests.py | 2 -- rhodecode/tests/vcs/test_commits.py | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py index 00c7cccb..af060d14 100644 --- a/rhodecode/tests/functional/test_pullrequests.py +++ b/rhodecode/tests/functional/test_pullrequests.py @@ -64,8 +64,6 @@ class TestPullrequestsController: assert response.status == '302 Found' assert redirect_url in response.location - @pytest.mark.xfail_backends( - "git", reason="Pending bugfix/feature, issue #6") def test_create_pr_form_with_raw_commit_id(self, backend): repo = backend.repo diff --git a/rhodecode/tests/vcs/test_commits.py b/rhodecode/tests/vcs/test_commits.py index 72068760..8fe10160 100644 --- a/rhodecode/tests/vcs/test_commits.py +++ b/rhodecode/tests/vcs/test_commits.py @@ -325,9 +325,12 @@ class TestCommits(BackendTestMixin): assert line_no == 1 assert commit_id == file_added_commit.raw_id assert commit_loader() == file_added_commit + + # git annotation is generated differently thus different results if self.repo.alias == 'git': - pytest.xfail("TODO: Git returns wrong value in line") - assert line == 'Foobar 3' + assert line == '(Joe Doe 2010-01-03 08:00:00 +0000 1) Foobar 3' + else: + assert line == 'Foobar 3' def test_get_file_annotate_does_not_exist(self): file_added_commit = self.repo.get_commit(commit_idx=2)