Merge lp:~jelmer/brz/walkdirs into lp:brz

[Jelmer Vernooij]

Fix walkdirs tests for formats without versioned directories.

Fix walkdirs tests for formats without versioned directories.

[Martin Packman (gz)]

Looks good.

review: Approve

=== modified file 'breezy/tests/per_tree/test_walkdirs.py'
--- breezy/tests/per_tree/test_walkdirs.py	2018-02-03 13:39:29 +0000
+++ breezy/tests/per_tree/test_walkdirs.py	2018-02-26 23:14:39 +0000
@@ -105,8 +105,10 @@
         if tree.path2id('file') is None:
             raise tests.TestNotApplicable(
                 'Tree type cannot represent dangling ids.')
-        expected = [(('', work_tree.path2id('')), [
-            ('dir', 'dir', 'unknown', None, dir_id, 'directory'),
-            ('file', 'file', 'unknown', None, file_id, 'file')]),
-            (('dir', dir_id), [])]
+        expected = [(('', work_tree.path2id('')), ([
+            ('dir', 'dir', 'unknown', None, dir_id, 'directory')]
+            if tree.has_versioned_directories() else []) +
+            [('file', 'file', 'unknown', None, file_id, 'file')])]
+        if tree.has_versioned_directories():
+            expected.append((('dir', dir_id), []))
         self.assertEqual(expected, list(tree.walkdirs()))
 
=== modified file 'breezy/tests/per_workingtree/test_walkdirs.py'
--- breezy/tests/per_workingtree/test_walkdirs.py	2018-02-21 20:07:48 +0000
+++ breezy/tests/per_workingtree/test_walkdirs.py	2018-02-26 23:14:39 +0000
@@ -115,10 +115,12 @@
             (dirblocks[1].as_dir_tuple(),
              [dirblocks[2].as_tuple()]
             ),
+            ]
+        if tree.has_versioned_directories():
+            expected_dirblocks.append(
             (dirblocks[3].as_dir_tuple(),
              []
-            ),
-            ]
+            ))
         if prefix:
             expected_dirblocks = [e for e in expected_dirblocks
                 if len(e) > 0 and len(e[0]) > 0 and e[0][0] == prefix]
@@ -158,7 +160,6 @@
 
     def test_walkdir_from_empty_dir(self):
         """Doing a walkdir when the requested prefix is empty dir."""
-        # TODO(jelmer): Support self.workingtree_format.supports_versioned_directories
         self._test_walkdir(self.added, 'added empty dir')
 
     def test_walkdir_from_missing_dir(self):