From 477e48ef6c9a4329fdcd42e06554544b83654fbc Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 13 Sep 2012 16:30:21 -0400
Subject: [PATCH] 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.
---
test/test_diff.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/test_diff.py b/test/test_diff.py
index 7133bb0..5f61b09 100644
--- a/test/test_diff.py
+++ b/test/test_diff.py
@@ -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')