# HG changeset patch # User Marcin Kuzminski # Date 2012-11-29 21:35:08 # Node ID b81680c97494a0de4ec869d25daeee578b972f83 # Parent c57a37430dc9abf5171fd771472acc9908f0baaa fixed tests diff --git a/rhodecode/lib/vcs/backends/git/inmemory.py b/rhodecode/lib/vcs/backends/git/inmemory.py --- a/rhodecode/lib/vcs/backends/git/inmemory.py +++ b/rhodecode/lib/vcs/backends/git/inmemory.py @@ -154,7 +154,6 @@ class GitInMemoryChangeset(BaseInMemoryC # Update vcs repository object & recreate dulwich repo self.repository.revisions.append(commit.id) - self.repository._repo = Repo(self.repository.path) # invalidate parsed refs after commit self.repository._parsed_refs = self.repository._get_parsed_refs() tip = self.repository.get_changeset() diff --git a/rhodecode/tests/vcs/test_git.py b/rhodecode/tests/vcs/test_git.py --- a/rhodecode/tests/vcs/test_git.py +++ b/rhodecode/tests/vcs/test_git.py @@ -470,9 +470,11 @@ class GitChangesetTest(unittest.TestCase for fname, revision_dict in files.items(): for rev, data in revision_dict.items(): cs = self.repo.get_changeset(rev) - ann = cs.get_file_annotate(fname) - l1 = [x[1].raw_id for x in ann] + l1_1 = [x[1] for x in cs.get_file_annotate(fname)] + l1_2 = [x[2]().raw_id for x in cs.get_file_annotate(fname)] + self.assertEqual(l1_1, l1_2) + l1 = l1_1 l2 = files[fname][rev]['changesets'] self.assertTrue(l1 == l2 , "The lists of revision for %s@rev %s" "from annotation list should match each other, " diff --git a/rhodecode/tests/vcs/test_hg.py b/rhodecode/tests/vcs/test_hg.py --- a/rhodecode/tests/vcs/test_hg.py +++ b/rhodecode/tests/vcs/test_hg.py @@ -392,13 +392,13 @@ class MercurialChangesetTest(unittest.Te 55: {'lines_no': 3, 'changesets': [7, 7, 7]}}} - for fname, revision_dict in files.items(): for rev, data in revision_dict.items(): cs = self.repo.get_changeset(rev) - ann = cs.get_file_annotate(fname) - - l1 = [x[1].revision for x in ann] + l1_1 = [x[1] for x in cs.get_file_annotate(fname)] + l1_2 = [x[2]().raw_id for x in cs.get_file_annotate(fname)] + self.assertEqual(l1_1, l1_2) + l1 = l1_2 = [x[2]().revision for x in cs.get_file_annotate(fname)] l2 = files[fname][rev]['changesets'] self.assertTrue(l1 == l2 , "The lists of revision for %s@rev%s" "from annotation list should match each other,"