index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Allan McRae <allan@archlinux.org> | 2010-05-30 14:41:59 +1000 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2010-06-02 13:14:51 -0500 |
commit | 844d82fad811626b0b8e54db60ee4b3ea32a3cb9 (patch) | |
tree | d6ae52c513db060b1f81227c34bfb366ea3fa58c /pactest/tests/fileconflict006.py | |
parent | ccea1b55766200c1ab371cf0f3b38c4cebdb2063 (diff) |
-rw-r--r-- | pactest/tests/fileconflict006.py | 24 |
diff --git a/pactest/tests/fileconflict006.py b/pactest/tests/fileconflict006.py deleted file mode 100644 index 84afff2d..00000000 --- a/pactest/tests/fileconflict006.py +++ /dev/null @@ -1,24 +0,0 @@ -self.description = "dir->symlink change during package upgrade (conflict)" - -p1 = pmpkg("pkg1", "1.0-1") -p1.files = ["test/", - "test/file1", - "test/dir/file1", - "test/dir/file2"] -self.addpkg2db("local", p1) - -p2 = pmpkg("pkg2") -p2.files = ["test/dir/file3"] -self.addpkg2db("local", p2) - -p3 = pmpkg("pkg1", "2.0-1") -p3.files = ["test2/", - "test2/file3", - "test -> test2"] -self.addpkg2db("sync", p3) - -self.args = "-S pkg1" - -self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_VERSION=pkg1|1.0-1") |