6 files changed, 12 insertions, 22 deletions
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/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/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
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