diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/sync304.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/sync306.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade078.py | 17 |
3 files changed, 8 insertions, 12 deletions
diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py index 4ac1a015..18058c99 100644 --- a/test/pacman/tests/sync304.py +++ b/test/pacman/tests/sync304.py @@ -19,9 +19,7 @@ self.option["SyncFirst"] = ["pacman"] self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") self.addrule("PKG_VERSION=pacman|4.0.1-1") -self.addrule("PKG_EXIST=pyalpm") self.addrule("PKG_VERSION=pyalpm|2-1") self.expectfailure = True diff --git a/test/pacman/tests/sync306.py b/test/pacman/tests/sync306.py index ca7a547e..c7401d07 100644 --- a/test/pacman/tests/sync306.py +++ b/test/pacman/tests/sync306.py @@ -59,5 +59,4 @@ self.addpkg2db("local", lp7) self.args = "-S pacman" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") self.addrule("PKG_VERSION=pacman|4.0.1-2") diff --git a/test/pacman/tests/upgrade078.py b/test/pacman/tests/upgrade078.py index 718d5871..8ef32456 100644 --- a/test/pacman/tests/upgrade078.py +++ b/test/pacman/tests/upgrade078.py @@ -20,15 +20,15 @@ expat_lpkg = pmpkg("expat", "2.0.1-6") self.addpkg2db("local", expat_lpkg) # Sync db -curl_sync = pmpkg("curl", "7.21.7-1") -self.addpkg2db("sync", curl_sync) +perl_sync = pmpkg("perl", "5.14.1-3") +perl_sync.depends = ["glibc"] +self.addpkg2db("sync", perl_sync) glibc_sync = pmpkg("glibc", "2.1.4-4") self.addpkg2db("sync", glibc_sync) -perl_sync = pmpkg("perl", "5.14.1-3") -perl_sync.depends = ["glibc"] -self.addpkg2db("sync", perl_sync) +curl_sync = pmpkg("curl", "7.21.7-1") +self.addpkg2db("sync", curl_sync) expat_sync = pmpkg("expat", "2.0.1-6") self.addpkg2db("sync", expat_sync) @@ -46,11 +46,10 @@ self.addrule("PKG_DEPENDS=git|perl") self.addrule("PKG_DEPENDS=perl|glibc") self.addrule("PKG_EXIST=git") self.addrule("PKG_VERSION=git|1.7.6-1") -self.addrule("PKG_EXIST=curl") self.addrule("PKG_VERSION=curl|7.21.7-1") -self.addrule("PKG_EXIST=glibc") self.addrule("PKG_VERSION=glibc|2.1.4-4") -self.addrule("PKG_EXIST=perl") self.addrule("PKG_VERSION=perl|5.14.1-3") -self.addrule("PKG_EXIST=expat") self.addrule("PKG_VERSION=expat|2.0.1-6") + +# --recursive operation was removed for now +self.expectfailure = True |