diff options
| -rw-r--r-- | git/test/fixtures/blame_incremental_2.11.1_plus | 33 | ||||
| -rw-r--r-- | git/test/test_repo.py | 38 |
2 files changed, 53 insertions, 18 deletions
diff --git a/git/test/fixtures/blame_incremental_2.11.1_plus b/git/test/fixtures/blame_incremental_2.11.1_plus new file mode 100644 index 00000000..beee7011 --- /dev/null +++ b/git/test/fixtures/blame_incremental_2.11.1_plus @@ -0,0 +1,33 @@ +82b8902e033430000481eb355733cd7065342037 2 2 1 +author Sebastian Thiel +author-mail <byronimo@gmail.com> +author-time 1270634931 +author-tz +0200 +committer Sebastian Thiel +committer-mail <byronimo@gmail.com> +committer-time 1270634931 +committer-tz +0200 +summary Used this release for a first beta of the 0.2 branch of development +previous 501bf602abea7d21c3dbb409b435976e92033145 AUTHORS +filename AUTHORS +82b8902e033430000481eb355733cd7065342037 14 14 1 +previous 501bf602abea7d21c3dbb409b435976e92033145 AUTHORS +filename AUTHORS +c76852d0bff115720af3f27acdb084c59361e5f6 1 1 1 +author Michael Trier +author-mail <mtrier@gmail.com> +author-time 1232829627 +author-tz -0500 +committer Michael Trier +committer-mail <mtrier@gmail.com> +committer-time 1232829627 +committer-tz -0500 +summary Lots of spring cleaning and added in Sphinx documentation. +previous bcd57e349c08bd7f076f8d6d2f39b702015358c1 AUTHORS +filename AUTHORS +c76852d0bff115720af3f27acdb084c59361e5f6 2 3 11 +previous bcd57e349c08bd7f076f8d6d2f39b702015358c1 AUTHORS +filename AUTHORS +c76852d0bff115720af3f27acdb084c59361e5f6 13 15 2 +previous bcd57e349c08bd7f076f8d6d2f39b702015358c1 AUTHORS +filename AUTHORS diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 4f9be4fc..91c780dd 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -387,24 +387,26 @@ class TestRepo(TestBase): @patch.object(Git, '_call_process') def test_blame_incremental(self, git): - git.return_value = fixture('blame_incremental') - blame_output = self.rorepo.blame_incremental('9debf6b0aafb6f7781ea9d1383c86939a1aacde3', 'AUTHORS') - blame_output = list(blame_output) - self.assertEqual(len(blame_output), 5) - - # Check all outputted line numbers - ranges = flatten([entry.linenos for entry in blame_output]) - self.assertEqual(ranges, flatten([range(2, 3), range(14, 15), range(1, 2), range(3, 14), range(15, 17)])) - - commits = [entry.commit.hexsha[:7] for entry in blame_output] - self.assertEqual(commits, ['82b8902', '82b8902', 'c76852d', 'c76852d', 'c76852d']) - - # Original filenames - self.assertSequenceEqual([entry.orig_path for entry in blame_output], [u'AUTHORS'] * len(blame_output)) - - # Original line numbers - orig_ranges = flatten([entry.orig_linenos for entry in blame_output]) - self.assertEqual(orig_ranges, flatten([range(2, 3), range(14, 15), range(1, 2), range(2, 13), range(13, 15)])) # noqa E501 + # loop over two fixtures, create a test fixture for 2.11.1+ syntax + for git_fixture in ('blame_incremental', 'blame_incremental_2.11.1_plus'): + git.return_value = fixture(git_fixture) + blame_output = self.rorepo.blame_incremental('9debf6b0aafb6f7781ea9d1383c86939a1aacde3', 'AUTHORS') + blame_output = list(blame_output) + self.assertEqual(len(blame_output), 5) + + # Check all outputted line numbers + ranges = flatten([entry.linenos for entry in blame_output]) + self.assertEqual(ranges, flatten([range(2, 3), range(14, 15), range(1, 2), range(3, 14), range(15, 17)])) + + commits = [entry.commit.hexsha[:7] for entry in blame_output] + self.assertEqual(commits, ['82b8902', '82b8902', 'c76852d', 'c76852d', 'c76852d']) + + # Original filenames + self.assertSequenceEqual([entry.orig_path for entry in blame_output], [u'AUTHORS'] * len(blame_output)) + + # Original line numbers + orig_ranges = flatten([entry.orig_linenos for entry in blame_output]) + self.assertEqual(orig_ranges, flatten([range(2, 3), range(14, 15), range(1, 2), range(2, 13), range(13, 15)])) # noqa E501 @patch.object(Git, '_call_process') def test_blame_complex_revision(self, git): |