Merge branch 'next' into 'master'

[bup.git] / lib / bup / t / thelpers.py

diff --git a/lib/bup/t/thelpers.py b/lib/bup/t/thelpers.py
index 17f6bcdbab2bb5e8b88ea7ee4a08203db3390d8b..89cccdaebad7214472c319e6206eb6854b209385 100644 (file)
--- a/lib/bup/t/thelpers.py
+++ b/lib/bup/t/thelpers.py
@@ -1,3 +1,4 @@
+import os
 from bup.helpers import *
 from wvtest import *
 
@@ -29,6 +30,27 @@ def test_strip_base_path():
     base_paths = ["/var", "/var/backup", "/var/backup/daily.0/localhost"]
     WVPASSEQ(strip_base_path(path, base_paths), '/etc')
 
+@wvtest
+def test_strip_symlinked_base_path():
+    tmpdir = os.path.join(os.getcwd(),"test_strip_symlinked_base_path.tmp")
+    symlink_src = os.path.join(tmpdir, "private", "var")
+    symlink_dst = os.path.join(tmpdir, "var")
+    path = os.path.join(symlink_dst, "a")
+
+    os.mkdir(tmpdir)
+    os.mkdir(os.path.join(tmpdir, "private"))
+    os.mkdir(symlink_src)
+    os.symlink(symlink_src, symlink_dst)
+
+    result = strip_base_path(path, [symlink_dst])
+
+    os.remove(symlink_dst)
+    os.rmdir(symlink_src)
+    os.rmdir(os.path.join(tmpdir, "private"))
+    os.rmdir(tmpdir)
+
+    WVPASSEQ(result, "/a")
+
 @wvtest
 def test_graft_path():
     middle_matching_old_path = "/user"