Merge lp:~jelmer/brz/shelving-directory-with-ignored into lp:brz

[Jelmer Vernooij]

Add a test to demonstrate that shelving a directory with ignored file fails. #611739

Based on https://code.launchpad.net/~n142857/+junk/shelving-directory-with-ignored

[Martin Packman (gz)]

Technically this should use one of the testtools helper methods, and also report unexpected success if the exception is not raised?

[Martin Packman (gz)]

Lets land and fixup later.

review: Approve

=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2017-11-17 03:06:50 +0000
+++ breezy/tests/test_shelf.py	2017-12-04 00:18:24 +0000
@@ -18,6 +18,7 @@
 
 from .. import (
     errors,
+    ignores,
     osutils,
     shelf,
     tests,
@@ -29,6 +30,10 @@
     )
 from . import (
     features,
+    KnownFailure,
+    )
+from .errors import (
+    MalformedTransform,
     )
 
 
@@ -226,6 +231,29 @@
         creator.transform()
         self.check_shelve_creation(creator, tree)
 
+    def test_shelve_directory_with_ignored(self):
+        tree = self.make_branch_and_tree('.')
+        tree.lock_write()
+        self.addCleanup(tree.unlock)
+        tree.commit('Empty tree')
+        self.build_tree_contents([('foo', 'a\n'), ('bar/',), ('bar/ignored','ign\n')])
+        tree.add(['foo', 'bar'], ['foo-id', 'bar-id'])
+        creator = shelf.ShelfCreator(tree, tree.basis_tree())
+        self.addCleanup(creator.finalize)
+        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
+                          ('add file', 'foo-id', 'file', 'foo')],
+                          sorted(list(creator.iter_shelvable())))
+        ignores._set_user_ignores([])
+        in_patterns = ['ignored',]
+        ignores.add_unique_user_ignores(in_patterns)
+
+        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
+        try:
+            creator.transform()
+            self.check_shelve_creation(creator, tree)
+        except MalformedTransform:
+            raise KnownFailure('shelving directory with ignored file: see bug #611739')
+
     def _test_shelve_symlink_creation(self, link_name, link_target,
                                       shelve_change=False):
         self.requireFeature(features.SymlinkFeature)