_casbaseddirectory.py: Do not resolve symlinks

This matches the change in utils._process_list().

This also removes the _Resolver class as it is now unused. We may want
to support controlled symlink resolution in the future, in which case
the _Resolver class can be resurrected from this commit.

1 files changed, 8 insertions, 6 deletions

diff --git a/tests/internals/storage_vdir_import.py b/tests/internals/storage_vdir_import.py
index 1d61a6e5f..0531b7c1b 100644
--- a/tests/internals/storage_vdir_import.py
+++ b/tests/internals/storage_vdir_import.py
@@ -28,12 +28,12 @@ root_filesets = [
     [('a/b/c/textfile1', 'F', 'This is textfile 1\n')],
     [('a/b/c/textfile1', 'F', 'This is the replacement textfile 1\n')],
     [('a/b/d', 'D', '')],
-    [('a/b/c', 'S', '/a/b/d')],
-    [('a/b/d', 'S', '/a/b/c')],
-    [('a/b/d', 'D', ''), ('a/b/c', 'S', '/a/b/d')],
-    [('a/b/c', 'D', ''), ('a/b/d', 'S', '/a/b/c')],
-    [('a/b', 'F', 'This is textfile 1\n')],
-    [('a/b/c', 'F', 'This is textfile 1\n')],
+    [('a/b/e', 'S', '/a/b/d')],
+    [('a/b/f', 'S', '/a/b/c')],
+    [('a/b/d', 'D', ''), ('a/b/e', 'S', '/a/b/d')],
+    [('a/b/c', 'D', ''), ('a/b/f', 'S', '/a/b/c')],
+    [('a/c', 'F', 'This is textfile 1\n')],
+    [('a/b/e', 'F', 'This is textfile 1\n')],
     [('a/b/c', 'D', '')]
 ]
 
@@ -77,6 +77,8 @@ def generate_random_root(rootno, directory):
         location = random.choice(locations)
         thingname = "node{}".format(i)
         thing = random.choice(['dir', 'link', 'file'])
+        if thing == 'dir':
+            thingname = "dir" + thingname
         target = os.path.join(rootdir, location, thingname)
         if thing == 'dir':
             os.makedirs(target)