diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-04-12 20:37:56 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-06-03 13:33:47 +1000 |
| commit | 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (patch) | |
| tree | e8d7720c44591267568694051313747df2b53b14 /test | |
| parent | 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c (diff) | |
alpm_filelist: remove resolved_path
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/fileconflict001.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict013.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict016.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict017.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict022.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict023.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict025.py | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index b1ad5e18..e1371f88 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -25,3 +25,5 @@ self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") self.addrule("FILE_EXIST=dir/realdir/realfile") self.addrule("!FILE_EXIST=dir/realdir/file") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict013.py b/test/pacman/tests/fileconflict013.py index 5c3a43b1..aacb730a 100644 --- a/test/pacman/tests/fileconflict013.py +++ b/test/pacman/tests/fileconflict013.py @@ -19,5 +19,3 @@ self.args = "-Su" self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_VERSION=pkg1|1.0-1") - -self.expectfailure = True diff --git a/test/pacman/tests/fileconflict016.py b/test/pacman/tests/fileconflict016.py index 86ddd720..dbcf7085 100644 --- a/test/pacman/tests/fileconflict016.py +++ b/test/pacman/tests/fileconflict016.py @@ -22,3 +22,5 @@ self.args = "-S pkg1 pkg2" self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict017.py b/test/pacman/tests/fileconflict017.py index 3855a938..4b91dc65 100644 --- a/test/pacman/tests/fileconflict017.py +++ b/test/pacman/tests/fileconflict017.py @@ -24,3 +24,5 @@ self.args = "-S pkg1 pkg2" self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict022.py b/test/pacman/tests/fileconflict022.py index 5ff0b537..b3920dfd 100644 --- a/test/pacman/tests/fileconflict022.py +++ b/test/pacman/tests/fileconflict022.py @@ -16,3 +16,5 @@ self.args = "-S %s %s" % (sp1.name, sp2.name) self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict023.py b/test/pacman/tests/fileconflict023.py index 9685c0dd..1a7eaaf7 100644 --- a/test/pacman/tests/fileconflict023.py +++ b/test/pacman/tests/fileconflict023.py @@ -17,5 +17,3 @@ self.args = "-S %s --ask=4" % sp1.name self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") - -self.expectfailure = True diff --git a/test/pacman/tests/fileconflict025.py b/test/pacman/tests/fileconflict025.py index 195badbc..263c81d4 100644 --- a/test/pacman/tests/fileconflict025.py +++ b/test/pacman/tests/fileconflict025.py @@ -16,5 +16,3 @@ self.args = "-S %s --ask=4" % sp1.name self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") - -self.expectfailure = True |