pkgdev commit: run mangling across change objects instead of raw paths

This allows for inspecting change attributes to alter potential
mangling. For example, now the entire date range in the copyright header
is replaced for new files instead of keeping the original start date
from the old files they were based on.

1 files changed, 15 insertions, 10 deletions

diff --git a/tests/test_mangle.py b/tests/test_mangle.py
index 1df646c..651f8b4 100644
--- a/tests/test_mangle.py
+++ b/tests/test_mangle.py
@@ -2,23 +2,29 @@ import os
 import multiprocessing
 import re
 import signal
+from functools import partial
 from unittest.mock import patch
 
 from pkgdev.mangle import Mangler
+from pkgdev.scripts.pkgdev_commit import Change
 import pytest
 from snakeoil.cli.exceptions import UserException
 
 
+def fake_change(s):
+    return Change('/repo', 'A', str(s))
+
+
 class TestMangler:
 
     def test_nonexistent_file(self, tmp_path):
         path = tmp_path / 'nonexistent'
-        assert list(Mangler([str(path)])) == []
+        assert list(Mangler([fake_change(path)])) == []
 
     def test_empty_file(self, tmp_path):
         path = tmp_path / 'empty'
         path.touch()
-        assert list(Mangler([str(path)])) == []
+        assert list(Mangler([fake_change(path)])) == []
 
     def test_skipped_file(self, tmp_path):
         paths = [(tmp_path / x) for x in ('file', 'file.patch')]
@@ -27,24 +33,24 @@ class TestMangler:
             p.write_text('# comment')
         # skip patch files
         skip_regex = re.compile(r'.+\.patch$')
-        mangled_paths = set(Mangler(map(str, paths), skip_regex=skip_regex))
+        mangled_paths = set(Mangler(map(fake_change, paths), skip_regex=skip_regex))
         assert mangled_paths == {str(tmp_path / 'file')}
 
         for p in paths:
             p.write_text('# comment')
         # don't skip any files
-        mangled_paths = set(Mangler(map(str, paths)))
+        mangled_paths = set(Mangler(map(fake_change, paths)))
         assert mangled_paths == set(map(str, paths))
 
     def test_nonmangled_file(self, tmp_path):
         path = tmp_path / 'file'
         path.write_text('# comment\n')
-        assert list(Mangler([str(path)])) == []
+        assert list(Mangler([fake_change(path)])) == []
 
     def test_mangled_file(self, tmp_path):
         path = tmp_path / 'file'
         path.write_text('# comment')
-        assert list(Mangler([str(path)])) == [str(path)]
+        assert list(Mangler([fake_change(path)])) == [str(path)]
         assert path.read_text() == '# comment\n'
 
     def test_iterator_exceptions(self, tmp_path):
@@ -55,9 +61,9 @@ class TestMangler:
         def _mangle_func(self, data):
             raise Exception('func failed')
 
-        with patch('pkgdev.mangle.Mangler._mangle_file', _mangle_func):
+        with patch('pkgdev.mangle.Mangler._mangle', _mangle_func):
             with pytest.raises(UserException, match='Exception: func failed'):
-                list(Mangler([str(path)]))
+                list(Mangler([fake_change(path)]))
 
     def test_sigint_handling(self, tmp_path):
         """Verify SIGINT is properly handled by the parallelized pipeline."""
@@ -68,7 +74,6 @@ class TestMangler:
             """Mangler run in a separate process that gets interrupted."""
             import sys
             import time
-            from functools import partial
             from unittest.mock import patch
 
             from pkgdev.mangle import Mangler
@@ -81,7 +86,7 @@ class TestMangler:
             with patch('pkgdev.mangle.Mangler.__iter__') as fake_iter:
                 fake_iter.side_effect = partial(sleep)
                 try:
-                    iter(Mangler([str(path)]))
+                    iter(Mangler([fake_change(path)]))
                 except KeyboardInterrupt:
                     queue.put(None)
                     sys.exit(0)