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

[Jelmer Vernooij]

Fix some walkdir tests for workingtree formats without support for versioned directories.

Fix some walkdir tests for workingtree formats without support for versioned directories.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/tests/per_workingtree/test_walkdirs.py'
--- breezy/tests/per_workingtree/test_walkdirs.py	2018-03-02 00:38:34 +0000
+++ breezy/tests/per_workingtree/test_walkdirs.py	2018-03-05 02:58:03 +0000
@@ -116,8 +116,7 @@
              [dirblocks[2].as_tuple()]
             ),
             ]
-        if tree.has_versioned_directories():
-            expected_dirblocks.append(
+        expected_dirblocks.append(
             (dirblocks[3].as_dir_tuple(),
              []
             ))
@@ -198,14 +197,18 @@
         link2_stat = os.lstat('link2')
         expected_dirblocks = [
              (('', tree.path2id('')),
-              [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'), 'directory'),
-               ('dir2', 'dir2', 'symlink', dir2_stat, tree.path2id('dir2'), 'directory'),
+              [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'),
+                  'directory' if tree.has_versioned_directories() else None),
+               ('dir2', 'dir2', 'symlink', dir2_stat, tree.path2id('dir2'),
+                   'directory' if tree.has_versioned_directories() else None),
                ('file1', 'file1', 'directory', file1_stat, tree.path2id('file1'), 'file'),
                ('file2', 'file2', 'symlink', file2_stat, tree.path2id('file2'), 'file'),
                ('link1', 'link1', 'file', link1_stat, tree.path2id('link1'), 'symlink'),
                ('link2', 'link2', 'directory', link2_stat, tree.path2id('link2'), 'symlink'),
               ]
-             ),
+             )]
+        if tree.has_versioned_directories():
+            expected_dirblocks.extend([
              (('dir1', tree.path2id('dir1')),
               [
               ]
@@ -213,7 +216,8 @@
              (('dir2', tree.path2id('dir2')),
               [
               ]
-             ),
+             )])
+        expected_dirblocks.extend([
              (('file1', None),
               [
               ]
@@ -222,10 +226,9 @@
               [
               ]
              ),
-            ]
-        tree.lock_read()
-        result = list(tree.walkdirs())
-        tree.unlock()
+            ])
+        with tree.lock_read():
+            result = list(tree.walkdirs())
         # check each return value for debugging ease.
         for pos, item in enumerate(expected_dirblocks):
             self.assertEqual(item, result[pos])
@@ -263,7 +266,8 @@
         else:
             expected_dirblocks = [
                  (('', tree.path2id('')),
-                  [('file1', 'file1', 'directory', file1_stat, tree.path2id('file1'), 'file'),
+                  [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'), None),
+                   ('file1', 'file1', 'directory', file1_stat, tree.path2id('file1'), 'file'),
                   ]
                  ),
                  (('file1', None),
@@ -271,9 +275,8 @@
                   ]
                  ),
                 ]
-        tree.lock_read()
-        result = list(tree.walkdirs())
-        tree.unlock()
+        with tree.lock_read():
+            result = list(tree.walkdirs())
         # check each return value for debugging ease.
         for pos, item in enumerate(expected_dirblocks):
             self.assertEqual(item, result[pos])