diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-04 17:30:31 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-04 17:30:31 +0200 |
| commit | 6fbb69306c0e14bacb8dcb92a89af27d3d5d631f (patch) | |
| tree | 4a6e0c14b412315c13cc4ac6466f4888644195a3 /test/git/test_diff.py | |
| parent | 25dca42bac17d511b7e2ebdd9d1d679e7626db5f (diff) | |
| parent | e746f96bcc29238b79118123028ca170adc4ff0f (diff) | |
| download | GitPython-6fbb69306c0e14bacb8dcb92a89af27d3d5d631f.tar.gz GitPython-6fbb69306c0e14bacb8dcb92a89af27d3d5d631f.zip | |
Merge branch 'odb'
Conflicts:
lib/git/cmd.py
Diffstat (limited to 'test/git/test_diff.py')
| -rw-r--r-- | test/git/test_diff.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/git/test_diff.py b/test/git/test_diff.py index 2f6a19bd..a113b992 100644 --- a/test/git/test_diff.py +++ b/test/git/test_diff.py @@ -20,7 +20,7 @@ class TestDiff(TestBase): return diffs def test_list_from_string_new_mode(self): - output = ListProcessAdapter(fixture('diff_new_mode')) + output = StringProcessAdapter(fixture('diff_new_mode')) diffs = Diff._index_from_patch_format(self.rorepo, output.stdout) self._assert_diff_format(diffs) @@ -28,7 +28,7 @@ class TestDiff(TestBase): assert_equal(10, len(diffs[0].diff.splitlines())) def test_diff_with_rename(self): - output = ListProcessAdapter(fixture('diff_rename')) + output = StringProcessAdapter(fixture('diff_rename')) diffs = Diff._index_from_patch_format(self.rorepo, output.stdout) self._assert_diff_format(diffs) @@ -47,7 +47,7 @@ class TestDiff(TestBase): "diff_tree_numstat_root" ) for fixture_name in fixtures: - diff_proc = ListProcessAdapter(fixture(fixture_name)) + diff_proc = StringProcessAdapter(fixture(fixture_name)) diffs = Diff._index_from_patch_format(self.rorepo, diff_proc.stdout) # END for each fixture |