test_diff: hunk.old_lines should be 1 in test_diff_tree and test_diff_merge.
In both cases, the file contents change from 'X contents\n' to 'X contents 2\n' (where 'X' is 'a' or 'b'). This means were removing one line and adding another. I'm not sure how this test was passing against libgit2 v0.17.0, so I may be missing something important.
This commit is contained in:
@@ -123,9 +123,9 @@ class DiffTest(utils.BareRepoTestCase):
|
||||
|
||||
hunk = diff.changes['hunks'][0]
|
||||
self.assertEqual(hunk.old_start, 1)
|
||||
self.assertEqual(hunk.old_lines, 0)
|
||||
self.assertEqual(hunk.old_lines, 1)
|
||||
self.assertEqual(hunk.new_start, 1)
|
||||
self.assertEqual(hunk.new_lines, 0)
|
||||
self.assertEqual(hunk.new_lines, 1)
|
||||
|
||||
self.assertEqual(hunk.old_file, 'a')
|
||||
self.assertEqual(hunk.new_file, 'a')
|
||||
@@ -157,9 +157,9 @@ class DiffTest(utils.BareRepoTestCase):
|
||||
|
||||
hunk = diff_b.changes['hunks'][1]
|
||||
self.assertEqual(hunk.old_start, 1)
|
||||
self.assertEqual(hunk.old_lines, 0)
|
||||
self.assertEqual(hunk.old_lines, 1)
|
||||
self.assertEqual(hunk.new_start, 1)
|
||||
self.assertEqual(hunk.new_lines, 0)
|
||||
self.assertEqual(hunk.new_lines, 1)
|
||||
|
||||
self.assertEqual(hunk.old_file, 'b')
|
||||
self.assertEqual(hunk.new_file, 'b')
|
||||
|
Reference in New Issue
Block a user