Fix unit tests

Signed-off-by: Uilian Ries <[email protected]>

Author: uilianries

.travis.yml

@@ -17,4 +17,4 @@ script:
   - coverage run tests/run_tests.py
   - coverage report -m
   # test distribution packaging
-  - python -m pypack patch.py
+  - python -m pypack patch_ng.py

patch_ng.py

@@ -79,7 +79,7 @@ def tostr(b):
 
 #------------------------------------------------
 # Logging is controlled by logger named after the
-# module name (e.g. 'patch' for patch.py module)
+# module name (e.g. 'patch' for patch_ng.py module)
 
 logger = logging.getLogger(__name__)
 
@@ -1247,7 +1247,7 @@ def main():
   else:
     patch.apply(options.strip, root=options.directory) or sys.exit(-1)
 
-  # todo: document and test line ends handling logic - patch.py detects proper line-endings
+  # todo: document and test line ends handling logic - patch_ng.py detects proper line-endings
   #       for inserted hunks and issues a warning if patched file has incosistent line ends
 
 

setup.py

@@ -120,7 +120,7 @@ def load_version():
     # pip to create the appropriate form of executable for the target platform.
     #entry_points={
     #    'console_scripts': [
-    #        'patch.py=patch',
+    #        'patch_ng.py=patch',
     #    ],
     #},
 )

tests/05hg_change.from

@@ -41,10 +41,10 @@ if "-v" in sys.argv or "--verbose" in sys.argv:
 tests_dir = dirname(abspath(__file__))
 
 
-# import patch.py from parent directory
+# import patch_ng.py from parent directory
 save_path = sys.path
 sys.path.insert(0, dirname(tests_dir))
-import patch
+import patch_ng
 sys.path = save_path
 
 
@@ -68,7 +68,7 @@ class TestPatchFiles(unittest.TestCase):
           f2.close()
         if f1:
           f1.close()
-  
+
   def _assert_dirs_equal(self, dir1, dir2, ignore=[]):
       """ compare dir1 with reference dir2
           .svn dirs are ignored
@@ -94,23 +94,23 @@ class TestPatchFiles(unittest.TestCase):
           continue
         self.fail("extra file or directory: %s" % e2)
 
-  
+
   def _run_test(self, testname):
       """
       boilerplate for running *.patch file tests
       """
 
       # 1. create temp test directory
       # 2. copy files
-      # 3. execute file-based patch 
+      # 3. execute file-based patch
       # 4. compare results
       # 5. cleanup on success
 
       tmpdir = mkdtemp(prefix="%s."%testname)
 
       patch_file = join(tmpdir, "%s.patch" % testname)
       shutil.copy(join(tests_dir, "%s.patch" % testname), patch_file)
-      
+
       from_src = join(tests_dir, "%s.from" % testname)
       from_tgt = join(tmpdir, "%s.from" % testname)
 
@@ -129,7 +129,7 @@ class TestPatchFiles(unittest.TestCase):
 
       # 3.
       # test utility as a whole
-      patch_tool = join(dirname(tests_dir), "patch.py")
+      patch_tool = join(dirname(tests_dir), "patch_ng.py")
       save_cwd = os.getcwdu()
       os.chdir(tmpdir)
       if verbose:
@@ -150,7 +150,7 @@ class TestPatchFiles(unittest.TestCase):
         # need recursive compare
         self._assert_dirs_equal(join(tests_dir, "%s.to" % testname), tmpdir, "%s.patch" % testname)
 
-        
+
 
       shutil.rmtree(tmpdir)
       return 0
@@ -200,7 +200,7 @@ class TestCheckPatched(unittest.TestCase):
         pto3 = patch.fromfile("03trail_fname.patch")
         self.assertEqual(None, pto3.can_patch("03trail_fname.to"))
         self.assertEqual(None, pto3.can_patch("not_in_source.also"))
-   
+
     def test_multiline_false_on_other_file(self):
         pto = patch.fromfile("01uni_multi.patch")
         os.chdir(join(tests_dir, "01uni_multi.from"))

tests/05hg_change.to

@@ -41,10 +41,10 @@ if "-v" in sys.argv or "--verbose" in sys.argv:
 tests_dir = dirname(abspath(__file__))
 
 
-# import patch.py from parent directory
+# import patch_ng.py from parent directory
 save_path = sys.path
 sys.path.insert(0, dirname(tests_dir))
-import patch
+import patch_ng
 sys.path = save_path
 
 
@@ -68,7 +68,7 @@ class TestPatchFiles(unittest.TestCase):
           f2.close()
         if f1:
           f1.close()
-  
+
   def _assert_dirs_equal(self, dir1, dir2, ignore=[]):
       """ compare dir1 with reference dir2
           .svn dirs are ignored
@@ -94,23 +94,23 @@ class TestPatchFiles(unittest.TestCase):
           continue
         self.fail("extra file or directory: %s" % e2)
 
-  
+
   def _run_test(self, testname):
       """
       boilerplate for running *.patch file tests
       """
 
       # 1. create temp test directory
       # 2. copy files
-      # 3. execute file-based patch 
+      # 3. execute file-based patch
       # 4. compare results
       # 5. cleanup on success
 
       tmpdir = mkdtemp(prefix="%s."%testname)
 
       patch_file = join(tmpdir, "%s.patch" % testname)
       shutil.copy(join(tests_dir, "%s.patch" % testname), patch_file)
-      
+
       from_src = join(tests_dir, "%s.from" % testname)
       from_tgt = join(tmpdir, "%s.from" % testname)
 
@@ -129,7 +129,7 @@ class TestPatchFiles(unittest.TestCase):
 
       # 3.
       # test utility as a whole
-      patch_tool = join(dirname(tests_dir), "patch.py")
+      patch_tool = join(dirname(tests_dir), "patch_ng.py")
       save_cwd = os.getcwdu()
       os.chdir(tmpdir)
       if verbose:
@@ -150,7 +150,7 @@ class TestPatchFiles(unittest.TestCase):
         # need recursive compare
         self._assert_dirs_equal(join(tests_dir, "%s.to" % testname), tmpdir, "%s.patch" % testname)
 
-        
+
 
       shutil.rmtree(tmpdir)
       return 0
@@ -200,7 +200,7 @@ class TestCheckPatched(unittest.TestCase):
         pto3 = patch.fromfile("03trail_fname.patch")
         self.assertEqual(None, pto3.can_patch("03trail_fname.to"))
         self.assertEqual(None, pto3.can_patch("not_in_source.also"))
-   
+
     def test_multiline_false_on_other_file(self):
         pto = patch.fromfile("01uni_multi.patch")
         os.chdir(join(tests_dir, "01uni_multi.from"))

tests/data/autofix/absolute-path.diff

@@ -1,11 +1,11 @@
-Index: c:/winnt/tests/run_tests.py
-===================================================================
---- c:/winnt/tests/run_tests.py	(revision 132)
-+++ c:/winnt/tests/run_tests.py	(working copy)
-@@ -240,6 +240,12 @@
+Index: c:/winnt/tests/run_tests.py
+===================================================================
+--- c:/winnt/tests/run_tests.py	(revision 132)
++++ c:/winnt/tests/run_tests.py	(working copy)
+@@ -240,6 +240,12 @@
          self.assertNotEqual(pto.parse(fp), True)
          fp.close()
- 
+
 +    def test_fail_absolute_path(self):
 +        fp = open(join(tests_dir, "data/failing/absolute-path.diff"))
 +        res = patch.PatchSet().parse(fp)
@@ -15,36 +15,36 @@ Index: c:/winnt/tests/run_tests.py
  class TestPatchApply(unittest.TestCase):
      def setUp(self):
          self.save_cwd = os.getcwdu()
-Index: c:/winnt/patch.py
-===================================================================
---- c:/winnt/patch.py	(revision 132)
-+++ c:/winnt/patch.py	(working copy)
-@@ -22,7 +22,7 @@
+Index: c:/winnt/patch_ng.py
+===================================================================
+--- c:/winnt/patch_ng.py	(revision 132)
++++ c:/winnt/patch_ng.py	(working copy)
+@@ -22,7 +22,7 @@
  from StringIO import StringIO
  import urllib2
- 
+
 -from os.path import exists, isfile, abspath
 +from os.path import exists, isabs, isfile, abspath
  from os import unlink
- 
- 
-@@ -439,7 +439,21 @@
-     
+
+
+@@ -439,7 +439,21 @@
+
      return (errors == 0)
- 
+
 +  def process_filenames():
 +    """ sanitize filenames
 +        return True on success
 +    """
 +    errors = 0
- 
+
 +    for i,p in enumerate(self.items):
-+      # 
++      #
 +
 +      # absolute paths are not allowed
 +      if isabs(p.source) or isabs(p.target):
 +        warning("error: absolute paths are not allowed for patch no.%d" % i)
-+    
++
 +    return (errors == 0)
 +
    def apply(self):

tests/data/autofix/parent-path.diff

@@ -1,13 +1,13 @@
-Index: patch.py
+Index: patch_ng.py
 ===================================================================
---- ../patch.py	(revision 151)
-+++ ../patch.py	(working copy)
+--- ../patch_ng.py	(revision 151)
++++ ../patch_ng.py	(working copy)
 @@ -13,7 +13,7 @@
  """
- 
+
  __author__ = "techtonik.rainforce.org"
 -__version__ = "1.11.10-dev"
 +__version__ = "1.11.11-dev"
- 
+
  import copy
  import logging