9 files changed, 49 insertions, 20 deletions
diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/epoch001.py
index b7ec9fcf..ac6c41a6 100644
--- a/test/pacman/tests/sync140.py
+++ b/test/pacman/tests/epoch001.py
@@ -1,7 +1,6 @@
 self.description = "Sysupgrade with a sync package having higher epoch"
 
-sp = pmpkg("dummy", "1.0-1")
-sp.epoch = 1
+sp = pmpkg("dummy", "1:1.0-1")
 self.addpkg2db("sync", sp)
 
 lp = pmpkg("dummy", "1.1-1")
@@ -10,4 +9,4 @@ self.addpkg2db("local", lp)
 self.args = "-Su"
 
 self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|1.0-1")
+self.addrule("PKG_VERSION=dummy|1:1.0-1")
diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/epoch002.py
index dac81f76..8ca4afc6 100644
--- a/test/pacman/tests/sync141.py
+++ b/test/pacman/tests/epoch002.py
@@ -3,8 +3,7 @@ self.description = "Sysupgrade with an epoch and ignore on same package"
 lp = pmpkg("dummy", "1.0-1")
 self.addpkg2db("local", lp)
 
-sp = pmpkg("dummy", "1.0-2")
-sp.epoch = 1
+sp = pmpkg("dummy", "1:1.0-2")
 self.addpkg2db("sync", sp)
 
 self.args = "-Su --ignore %s" % lp.name
diff --git a/test/pacman/tests/sync142.py b/test/pacman/tests/epoch003.py
index 726ef304..ac395e30 100644
--- a/test/pacman/tests/sync142.py
+++ b/test/pacman/tests/epoch003.py
@@ -1,14 +1,12 @@
 self.description = "Sysupgrade with an epoch package overriding a force package"
 
-sp = pmpkg("dummy", "1.4-1")
-sp.epoch = 2
+sp = pmpkg("dummy", "2:1.4-1")
 self.addpkg2db("sync", sp)
 
-lp = pmpkg("dummy", "2.0-1")
-lp.force = True
+lp = pmpkg("dummy", "1:2.0-1")
 self.addpkg2db("local", lp)
 
 self.args = "-Su"
 
 self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|1.4-1")
+self.addrule("PKG_VERSION=dummy|2:1.4-1")
diff --git a/test/pacman/tests/sync143.py b/test/pacman/tests/epoch004.py
index 2ee940a9..74b00c2b 100644
--- a/test/pacman/tests/sync143.py
+++ b/test/pacman/tests/epoch004.py
@@ -1,18 +1,16 @@
 self.description = "Sysupgrade with same version, different epochs"
 
-sp = pmpkg("dummy", "2.0-1")
+sp = pmpkg("dummy", "2:2.0-1")
 sp.files = ["bin/dummynew"]
-sp.epoch = 2
 self.addpkg2db("sync", sp)
 
-lp = pmpkg("dummy", "2.0-1")
+lp = pmpkg("dummy", "1:2.0-1")
 lp.files = ["bin/dummyold"]
-lp.force = True
 self.addpkg2db("local", lp)
 
 self.args = "-Su"
 
 self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|2.0-1")
+self.addrule("PKG_VERSION=dummy|2:2.0-1")
 self.addrule("FILE_EXIST=bin/dummynew")
 self.addrule("!FILE_EXIST=bin/dummyold")
diff --git a/test/pacman/tests/epoch010.py b/test/pacman/tests/epoch010.py
new file mode 100644
index 00000000..03bba273
--- /dev/null
+++ b/test/pacman/tests/epoch010.py
@@ -0,0 +1,12 @@
+self.description = "usbutils case study: force in new package"
+
+sp = pmpkg("usbutils", "1:001-1")
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("usbutils", "0.91-4")
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=usbutils|1:001-1")
diff --git a/test/pacman/tests/epoch011.py b/test/pacman/tests/epoch011.py
new file mode 100644
index 00000000..bc5ee619
--- /dev/null
+++ b/test/pacman/tests/epoch011.py
@@ -0,0 +1,12 @@
+self.description = "usbutils case study: force stays, epoch now in local db"
+
+sp = pmpkg("usbutils", "1:002-1")
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("usbutils", "1:001-1")
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=usbutils|1:002-1")
diff --git a/test/pacman/tests/epoch012.py b/test/pacman/tests/epoch012.py
new file mode 100644
index 00000000..2a7a7ac2
--- /dev/null
+++ b/test/pacman/tests/epoch012.py
@@ -0,0 +1,13 @@
+self.description = "usbutils case study: maintainer screws up and removes force"
+
+sp = pmpkg("usbutils", "003-1")
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("usbutils", "1:002-1")
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+# remember, this is how we have to handle this- 003 will not be installed
+self.addrule("PKG_VERSION=usbutils|1:002-1")
diff --git a/test/pacman/tests/sync136.py b/test/pacman/tests/sync136.py
index b3a6baf4..b31aae2c 100644
--- a/test/pacman/tests/sync136.py
+++ b/test/pacman/tests/sync136.py
@@ -1,7 +1,6 @@
 self.description = "Sysupgrade with a sync package forcing a downgrade"
 
-sp = pmpkg("dummy", "1.0-1")
-sp.force = True
+sp = pmpkg("dummy", "1:1.0-1")
 
 self.addpkg2db("sync", sp)
 
@@ -12,4 +11,4 @@ self.addpkg2db("local", lp)
 self.args = "-Su"
 
 self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|1.0-1")
+self.addrule("PKG_VERSION=dummy|1:1.0-1")
diff --git a/test/pacman/tests/sync137.py b/test/pacman/tests/sync137.py
index 000855c5..d76ac49d 100644
--- a/test/pacman/tests/sync137.py
+++ b/test/pacman/tests/sync137.py
@@ -4,8 +4,7 @@ lp = pmpkg("dummy", "1.0-1")
 
 self.addpkg2db("local", lp)
 
-sp = pmpkg("dummy", "1.0-2")
-sp.force = True
+sp = pmpkg("dummy", "1:1.0-2")
 self.addpkg2db("sync", sp)
 
 self.args = "-Su --ignore %s" % lp.name