From 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 3 Jan 2011 17:28:20 -0600
Subject: pactest: Rename epoch pactests

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 test/pacman/tests/epoch001.py | 13 +++++++++++++
 test/pacman/tests/epoch002.py | 13 +++++++++++++
 test/pacman/tests/epoch003.py | 14 ++++++++++++++
 test/pacman/tests/epoch004.py | 18 ++++++++++++++++++
 test/pacman/tests/sync140.py  | 13 -------------
 test/pacman/tests/sync141.py  | 13 -------------
 test/pacman/tests/sync142.py  | 14 --------------
 test/pacman/tests/sync143.py  | 18 ------------------
 8 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 test/pacman/tests/epoch001.py
 create mode 100644 test/pacman/tests/epoch002.py
 create mode 100644 test/pacman/tests/epoch003.py
 create mode 100644 test/pacman/tests/epoch004.py
 delete mode 100644 test/pacman/tests/sync140.py
 delete mode 100644 test/pacman/tests/sync141.py
 delete mode 100644 test/pacman/tests/sync142.py
 delete mode 100644 test/pacman/tests/sync143.py

diff --git a/test/pacman/tests/epoch001.py b/test/pacman/tests/epoch001.py
new file mode 100644
index 00000000..b7ec9fcf
--- /dev/null
+++ b/test/pacman/tests/epoch001.py
@@ -0,0 +1,13 @@
+self.description = "Sysupgrade with a sync package having higher epoch"
+
+sp = pmpkg("dummy", "1.0-1")
+sp.epoch = 1
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("dummy", "1.1-1")
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-1")
diff --git a/test/pacman/tests/epoch002.py b/test/pacman/tests/epoch002.py
new file mode 100644
index 00000000..dac81f76
--- /dev/null
+++ b/test/pacman/tests/epoch002.py
@@ -0,0 +1,13 @@
+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
+self.addpkg2db("sync", sp)
+
+self.args = "-Su --ignore %s" % lp.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-1")
diff --git a/test/pacman/tests/epoch003.py b/test/pacman/tests/epoch003.py
new file mode 100644
index 00000000..726ef304
--- /dev/null
+++ b/test/pacman/tests/epoch003.py
@@ -0,0 +1,14 @@
+self.description = "Sysupgrade with an epoch package overriding a force package"
+
+sp = pmpkg("dummy", "1.4-1")
+sp.epoch = 2
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("dummy", "2.0-1")
+lp.force = True
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.4-1")
diff --git a/test/pacman/tests/epoch004.py b/test/pacman/tests/epoch004.py
new file mode 100644
index 00000000..2ee940a9
--- /dev/null
+++ b/test/pacman/tests/epoch004.py
@@ -0,0 +1,18 @@
+self.description = "Sysupgrade with same version, different epochs"
+
+sp = pmpkg("dummy", "2.0-1")
+sp.files = ["bin/dummynew"]
+sp.epoch = 2
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("dummy", "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("FILE_EXIST=bin/dummynew")
+self.addrule("!FILE_EXIST=bin/dummyold")
diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py
deleted file mode 100644
index b7ec9fcf..00000000
--- a/test/pacman/tests/sync140.py
+++ /dev/null
@@ -1,13 +0,0 @@
-self.description = "Sysupgrade with a sync package having higher epoch"
-
-sp = pmpkg("dummy", "1.0-1")
-sp.epoch = 1
-self.addpkg2db("sync", sp)
-
-lp = pmpkg("dummy", "1.1-1")
-self.addpkg2db("local", lp)
-
-self.args = "-Su"
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|1.0-1")
diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py
deleted file mode 100644
index dac81f76..00000000
--- a/test/pacman/tests/sync141.py
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-self.addpkg2db("sync", sp)
-
-self.args = "-Su --ignore %s" % lp.name
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|1.0-1")
diff --git a/test/pacman/tests/sync142.py b/test/pacman/tests/sync142.py
deleted file mode 100644
index 726ef304..00000000
--- a/test/pacman/tests/sync142.py
+++ /dev/null
@@ -1,14 +0,0 @@
-self.description = "Sysupgrade with an epoch package overriding a force package"
-
-sp = pmpkg("dummy", "1.4-1")
-sp.epoch = 2
-self.addpkg2db("sync", sp)
-
-lp = pmpkg("dummy", "2.0-1")
-lp.force = True
-self.addpkg2db("local", lp)
-
-self.args = "-Su"
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=dummy|1.4-1")
diff --git a/test/pacman/tests/sync143.py b/test/pacman/tests/sync143.py
deleted file mode 100644
index 2ee940a9..00000000
--- a/test/pacman/tests/sync143.py
+++ /dev/null
@@ -1,18 +0,0 @@
-self.description = "Sysupgrade with same version, different epochs"
-
-sp = pmpkg("dummy", "2.0-1")
-sp.files = ["bin/dummynew"]
-sp.epoch = 2
-self.addpkg2db("sync", sp)
-
-lp = pmpkg("dummy", "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("FILE_EXIST=bin/dummynew")
-self.addrule("!FILE_EXIST=bin/dummyold")
-- 
cgit v1.2.3-70-g09d2