Merge lp:~gz/juju-release-tools/non_patch_ext into lp:juju-release-tools

[Martin Packman]

Allow and ignore files that aren't patches in patch directory

Juju is ready to remove the current godeps patch from master as the fix has landed upstream. As git doesn't version directories, this means we want to add a file in there that will keep the directory around but not be applied as a patch.

This branch limits patching to files that have either the 'diff' or 'patch' file extension.

[lp:~gz/juju-release-tools/non_patch_ext]

332. By Martin Packman on 2016-08-18

Fix typo noted by babbageclunk in review

[Curtis Hovey (sinzui)]

thank you.

review: Approve (code)

=== modified file 'apply_patches.py'
--- apply_patches.py	2016-07-21 15:30:35 +0000
+++ apply_patches.py	2016-08-18 13:37:20 +0000
@@ -10,6 +10,9 @@
 import sys
 
 
+PATCH_EXTENSIONS = (".diff", ".patch")
+
+
 def apply_patch(patch_file, base_dir, dry_run=False, verbose=False):
     """Run external patch command to apply given patch_file to base_dir."""
     patch_cmd = ["patch", "-f", "-u", "-p1", "-r-"]
@@ -40,11 +43,12 @@
     parser = get_arg_parser()
     args = parser.parse_args(argv[1:])
     try:
-        patches = sorted(os.listdir(args.patchdir))
+        maybe_patches = sorted(os.listdir(args.patchdir))
     except OSError as e:
         parser.error("Could not list patch directory: {}".format(e))
     if not os.path.isdir(args.srctree):
         parser.error("Source tree '{}' not a directory".format(args.srctree))
+    patches = [f for f in maybe_patches if f.endswith(PATCH_EXTENSIONS)]
     patch_count = len(patches)
     print(gettext.ngettext(
         u"Applying {} patch", u"Applying {} patches", patch_count).format(

=== modified file 'tests/test_apply_patches.py'
--- tests/test_apply_patches.py	2016-07-21 16:44:30 +0000
+++ tests/test_apply_patches.py	2016-08-18 13:37:20 +0000
@@ -129,7 +129,7 @@
         with temp_dir() as basedir:
             patchdir = os.path.join(basedir, "patches")
             os.mkdir(patchdir)
-            patchfile = os.path.join(patchdir, "sample.patch")
+            patchfile = os.path.join(patchdir, "sample.diff")
             open(patchfile, "w").close()
             with self.patch_output() as messages:
                 with mock.patch(
@@ -138,7 +138,7 @@
                     main(["test", patchdir, basedir])
             ap_mock.assert_called_once_with(patchfile, basedir, False, False)
             self.assertEqual(messages, [
-                u"Applying 1 patch", u"Applied patch 'sample.patch'"
+                u"Applying 1 patch", u"Applied patch 'sample.diff'"
             ])
 
     def test_bad_patches(self):
@@ -158,3 +158,16 @@
             self.assertEqual(messages, [
                 u"Applying 2 patches", u"Failed to apply patch 'a.patch'"
             ])
+
+    def test_non_patch(self):
+        with temp_dir() as basedir:
+            patchdir = os.path.join(basedir, "patches")
+            os.mkdir(patchdir)
+            patch_a = os.path.join(patchdir, "readme.txt")
+            open(patch_a, "w").close()
+            with self.patch_output() as messages:
+                with mock.patch(
+                        "apply_patches.apply_patch", autospec=True) as ap_mock:
+                    main(["test", "--verbose", patchdir, basedir])
+            self.assertEqual(ap_mock.mock_calls, [])
+            self.assertEqual(messages, [u"Applying 0 patches"])