[cedar-backup-svn] SF.net SVN: cedar-backup: [855] cedar-backup2/trunk
Brought to you by:
pronovic
|
From: <pro...@us...> - 2008-03-17 02:04:58
|
Revision: 855
http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=855&view=rev
Author: pronovic
Date: 2008-03-16 19:04:53 -0700 (Sun, 16 Mar 2008)
Log Message:
-----------
Add linkDepth parameter to FilesystemList.addDirContents()
Modified Paths:
--------------
cedar-backup2/trunk/CedarBackup2/filesystem.py
cedar-backup2/trunk/Changelog
cedar-backup2/trunk/test/filesystemtests.py
Modified: cedar-backup2/trunk/CedarBackup2/filesystem.py
===================================================================
--- cedar-backup2/trunk/CedarBackup2/filesystem.py 2008-03-16 23:35:54 UTC (rev 854)
+++ cedar-backup2/trunk/CedarBackup2/filesystem.py 2008-03-17 02:04:53 UTC (rev 855)
@@ -8,7 +8,7 @@
#
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
-# Copyright (c) 2004-2007 Kenneth J. Pronovici.
+# Copyright (c) 2004-2008 Kenneth J. Pronovici.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
@@ -357,7 +357,7 @@
logger.debug("Added directory to list: [%s]" % path)
return 1
- def addDirContents(self, path, recursive=True, addSelf=True):
+ def addDirContents(self, path, recursive=True, addSelf=True, linkDepth=0):
"""
Adds the contents of a directory to the list.
@@ -372,11 +372,17 @@
directory and all of its contents will be recursively excluded from the
list.
- @note: If the passed-in directory happens to be a soft link, it will
- still be recursed. However, any soft links I{within} the directory will
- only be added by name, not recursively. Any invalid soft links (i.e.
- soft links that point to non-existent items) will be silently ignored.
+ @note: If the passed-in directory happens to be a soft link, it will be
+ recursed. However, the linkDepth parameter controls whether any soft
+ links I{within} the directory will be recursed. The link depth is
+ maximum depth of the tree at which soft links should be followed. So, a
+ depth of 0 does not follow any soft links, a depth of 1 follows only
+ links within the passed-in directory, a depth of 2 follows the links at
+ the next level down, etc.
+ @note: Any invalid soft links (i.e. soft links that point to
+ non-existent items) will be silently ignored.
+
@note: The L{excludeDirs} flag only controls whether any given directory
path itself is added to the list once it has been discovered. It does
I{not} modify any behavior related to directory recursion.
@@ -390,6 +396,9 @@
@param addSelf: Indicates whether the directory itself should be added to the list.
@type addSelf: Boolean value
+ @param linkDepth: Depth to which soft links should be followed
+ @type linkDepth: Integer value, where zero means not to follow any soft links
+
@return: Number of items recursively added to the list
@raise ValueError: If path is not a directory or does not exist.
@@ -397,9 +406,9 @@
"""
path = encodePath(path)
path = normalizeDir(path)
- return self._addDirContentsInternal(path, recursive=recursive, includePath=addSelf)
+ return self._addDirContentsInternal(path, addSelf, recursive, linkDepth)
- def _addDirContentsInternal(self, path, includePath=True, recursive=True):
+ def _addDirContentsInternal(self, path, includePath=True, recursive=True, linkDepth=0):
"""
Internal implementation of C{addDirContents}.
@@ -411,9 +420,15 @@
interface, C{addDirContents} ends up being wholly implemented in terms
of this method.
+ The linkDepth parameter controls whether soft links are followed when we
+ are adding the contents recursively. Any recursive calls reduce the
+ value by one. If the value zero or less, then soft links will just be
+ added as directories, but will not be followed.
+
@param path: Directory path whose contents should be added to the list.
@param includePath: Indicates whether to include the path as well as contents.
@param recursive: Indicates whether directory contents should be added recursively.
+ @param linkDepth: Depth of soft links that should be followed
@return: Number of items recursively added to the list
@@ -445,10 +460,15 @@
added += self.addFile(entrypath)
elif os.path.isdir(entrypath):
if os.path.islink(entrypath):
- added += self.addDir(entrypath)
+ if recursive and linkDepth > 0:
+ newDepth = linkDepth - 1;
+ added += self._addDirContentsInternal(entrypath, linkDepth=newDepth)
+ else:
+ added += self.addDir(entrypath)
else:
if recursive:
- added += self._addDirContentsInternal(entrypath)
+ newDepth = linkDepth - 1;
+ added += self._addDirContentsInternal(entrypath, linkDepth=newDepth)
else:
added += self.addDir(entrypath)
return added
@@ -1193,7 +1213,7 @@
# Add methods
##############
- def addDirContents(self, path, recursive=True, addSelf=False):
+ def addDirContents(self, path, recursive=True, addSelf=True, linkDepth=0):
"""
Adds the contents of a directory to the list.
@@ -1208,11 +1228,17 @@
directory and all of its contents will be recursively excluded from the
list.
- @note: If the passed-in directory happens to be a soft link, it will
- still be recursed. However, any soft links I{within} the directory will
- only be added by name, not recursively. Any invalid soft links (i.e.
- soft links that point to non-existent items) will be silently ignored.
+ @note: If the passed-in directory happens to be a soft link, it will be
+ recursed. However, the linkDepth parameter controls whether any soft
+ links I{within} the directory will be recursed. The link depth is
+ maximum depth of the tree at which soft links should be followed. So, a
+ depth of 0 does not follow any soft links, a depth of 1 follows only
+ links within the passed-in directory, a depth of 2 follows the links at
+ the next level down, etc.
+ @note: Any invalid soft links (i.e. soft links that point to
+ non-existent items) will be silently ignored.
+
@note: The L{excludeDirs} flag only controls whether any given soft link
path itself is added to the list once it has been discovered. It does
I{not} modify any behavior related to directory recursion.
@@ -1229,6 +1255,9 @@
@param addSelf: Ignored in this subclass.
+ @param linkDepth: Depth of soft links that should be followed
+ @type linkDepth: Integer value, where zero means not to follow any soft links
+
@return: Number of items recursively added to the list
@raise ValueError: If path is not a directory or does not exist.
@@ -1236,7 +1265,7 @@
"""
path = encodePath(path)
path = normalizeDir(path)
- return super(PurgeItemList, self)._addDirContentsInternal(path, includePath=False, recursive=recursive)
+ return super(PurgeItemList, self)._addDirContentsInternal(path, False, recursive, linkDepth)
##################
@@ -1372,6 +1401,8 @@
between the directories containing different files, and containing the same
files with differing content.
+ @note: Symlinks are I{not} followed for the purposes of this comparison.
+
@param path1: First path to compare.
@type path1: String representing a path on disk
Modified: cedar-backup2/trunk/Changelog
===================================================================
--- cedar-backup2/trunk/Changelog 2008-03-16 23:35:54 UTC (rev 854)
+++ cedar-backup2/trunk/Changelog 2008-03-17 02:04:53 UTC (rev 855)
@@ -1,3 +1,7 @@
+Version 2.16.0 unreleased
+
+ * Add linkDepth parameter to FilesystemList.addDirContents().
+
Version 2.15.3 16 Mar 2008
* Fix testEncodePath_009() to be aware of "UTF-8" encoding.
Modified: cedar-backup2/trunk/test/filesystemtests.py
===================================================================
--- cedar-backup2/trunk/test/filesystemtests.py 2008-03-16 23:35:54 UTC (rev 854)
+++ cedar-backup2/trunk/test/filesystemtests.py 2008-03-17 02:04:53 UTC (rev 855)
@@ -9,7 +9,7 @@
#
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
-# Copyright (c) 2004-2007 Kenneth J. Pronovici.
+# Copyright (c) 2004-2008 Kenneth J. Pronovici.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
@@ -4751,7 +4751,691 @@
self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", ]) in fsList)
+ def testAddDirContents_091(self):
+ """
+ Attempt to add a directory with linkDepth=1.
+ """
+ self.extractTar("tree6")
+ path = self.buildPath(["tree6"])
+ fsList = FilesystemList()
+ count = fsList.addDirContents(path, addSelf=False, linkDepth=1)
+ if not platformSupportsLinks():
+ self.failUnlessEqual(121, count)
+ self.failUnlessEqual(121, len(fsList))
+ self.failUnless(self.buildPath([ "tree6", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
+ else:
+ self.failUnlessEqual(165, count)
+ self.failUnlessEqual(165, len(fsList))
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
+ def testAddDirContents_092(self):
+ """
+ Attempt to add a directory with linkDepth=2.
+ """
+ self.extractTar("tree6")
+ path = self.buildPath(["tree6"])
+ fsList = FilesystemList()
+ count = fsList.addDirContents(path, addSelf=False, linkDepth=2)
+ if not platformSupportsLinks():
+ self.failUnlessEqual(121, count)
+ self.failUnlessEqual(121, len(fsList))
+ self.failUnless(self.buildPath([ "tree6", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
+ else:
+ self.failUnlessEqual(247, count)
+ self.failUnlessEqual(247, len(fsList))
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir002", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "dir001...
[truncated message content] |