diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/pacman/pmpkg.py | 2 | ||||
| -rwxr-xr-x | test/pacman/pmrule.py | 8 | ||||
| -rw-r--r-- | test/pacman/tests/symlink002.py | 43 | ||||
| -rwxr-xr-x | test/pacman/util.py | 6 |
4 files changed, 54 insertions, 5 deletions
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 59204265..42573428 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -103,7 +103,7 @@ class pmpkg(object): # Generate package file system for f in self.files: util.mkfile(f, f) - self.size += os.stat(util.getfilename(f))[stat.ST_SIZE] + self.size += os.lstat(util.getfilename(f))[stat.ST_SIZE] # .PKGINFO data = ["pkgname = %s" % self.name] diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index c68d085e..0f6ae602 100755 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,6 +146,14 @@ class pmrule(object): else: print "FILE rule '%s' not found" % case success = -1 + elif kind == "LINK": + filename = os.path.join(test.root, key) + if case == "EXIST": + if not os.path.islink(filename): + success = 0 + else: + print "LINK rule '%s' not found" % case + success = -1 elif kind == "CACHE": cachedir = os.path.join(test.root, util.PM_CACHEDIR) if case == "EXISTS": diff --git a/test/pacman/tests/symlink002.py b/test/pacman/tests/symlink002.py new file mode 100644 index 00000000..6b7423d9 --- /dev/null +++ b/test/pacman/tests/symlink002.py @@ -0,0 +1,43 @@ +self.description = "Dead backed-up symlink when removing package (FS#24230)" + +# symlink file is changed +lp = pmpkg("dummy") +lp.files = ["etc/brokenlink -> nonexistent", + "etc/exists"] +lp.backup = ["etc/brokenlink*"] +self.addpkg2db("local", lp) + +# symlink file is not changed +lp2 = pmpkg("dummy2") +lp2.files = ["etc/brokenlink2 -> nonexistent2", + "etc/exists2"] +lp2.backup = ["etc/brokenlink2"] +self.addpkg2db("local", lp2) + +# package is left alone, not uninstalled +lp3 = pmpkg("dummy3") +lp3.files = ["etc/brokenlink3 -> nonexistent3", + "etc/exists3"] +self.addpkg2db("local", lp3) + +self.args = "-R %s %s" % (lp.name, lp2.name) +#self.args = "-R" + +self.addrule("PACMAN_RETCODE=0") + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!LINK_EXIST=etc/brokenlink") +self.addrule("!FILE_EXIST=etc/nonexistent") +self.addrule("!FILE_EXIST=etc/exists") + +self.addrule("!PKG_EXIST=dummy2") +self.addrule("!LINK_EXIST=etc/brokenlink2") +self.addrule("!FILE_EXIST=etc/nonexistent2") +self.addrule("!FILE_EXIST=etc/exists2") + +self.addrule("PKG_EXIST=dummy3") +self.addrule("LINK_EXIST=etc/brokenlink3") +self.addrule("!FILE_EXIST=etc/nonexistent") +self.addrule("FILE_EXIST=etc/exists3") +self.addrule("FILE_TYPE=etc/brokenlink3|link") +self.addrule("FILE_TYPE=etc/exists3|file") diff --git a/test/pacman/util.py b/test/pacman/util.py index 47255923..ddd955a2 100755 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -150,7 +150,6 @@ def getmd5sum(filename): """ """ if not os.path.isfile(filename): - print "file %s does not exist!" % filename return "" fd = open(filename, "rb") checksum = hashlib.md5() @@ -178,9 +177,8 @@ def getmtime(filename): """ """ if not os.path.exists(filename): - print "path %s does not exist!" % filename - return 0, 0, 0 - st = os.stat(filename) + return None, None, None + st = os.lstat(filename) return st[stat.ST_ATIME], st[stat.ST_MTIME], st[stat.ST_CTIME] # |