From 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 15 Feb 2012 15:16:23 -0600 Subject: Revert "Enable recursive/needed sync on SyncFirst" This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be. Tests affected by this revert have been adjusted; additionally a few EXIST tests have been removed where there is already a VERSION test doing the job for us. Signed-off-by: Dan McGee --- test/pacman/tests/sync302.py | 8 ++++---- test/pacman/tests/sync303.py | 3 --- test/pacman/tests/sync305.py | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/pacman/tests/sync302.py b/test/pacman/tests/sync302.py index b44aaed4..78e45c33 100644 --- a/test/pacman/tests/sync302.py +++ b/test/pacman/tests/sync302.py @@ -38,12 +38,12 @@ self.option["SyncFirst"] = ["pacman"] self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") self.addrule("PKG_VERSION=pacman|1.0-2") self.addrule("PKG_EXIST=glibc") -self.addrule("PKG_VERSION=glibc|2.15-1") self.addrule("PKG_EXIST=curl") -self.addrule("PKG_VERSION=curl|7.22-1") self.addrule("PKG_EXIST=libarchive") -self.addrule("PKG_VERSION=libarchive|2.8.5-1") +# TODO: when SyncFirst recursive comes back, re-enable these +#self.addrule("PKG_VERSION=glibc|2.15-1") +#self.addrule("PKG_VERSION=curl|7.22-1") +#self.addrule("PKG_VERSION=libarchive|2.8.5-1") self.addrule("PKG_EXIST=zlib") diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py index b717dd2c..9d7bab58 100644 --- a/test/pacman/tests/sync303.py +++ b/test/pacman/tests/sync303.py @@ -29,10 +29,7 @@ self.option["SyncFirst"] = ["pacman"] self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") self.addrule("PKG_VERSION=pacman|1.0-2") self.addrule("PKG_EXIST=glibc-awesome") self.addrule("PKG_VERSION=glibc-awesome|2.13-2") self.addrule("PKG_EXIST=zlib") - -self.expectfailure = True diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py index 24fcee48..62005b58 100644 --- a/test/pacman/tests/sync305.py +++ b/test/pacman/tests/sync305.py @@ -61,7 +61,4 @@ 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-2") - -self.expectfailure = True -- cgit v1.2.3-24-g4f1b