summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2007-12-22 20:32:57 +0100
committerDan McGee <dan@archlinux.org>2007-12-28 19:56:29 -0600
commit73aa6b610e22377a40c567156b610319ffb9e024 (patch)
tree2aa6419e7ffb907a4bc68c94f2b79c611b20c1b4
parent630541a72e2ca041d2fb4401b374670134b12c3d (diff)
downloadpacman-73aa6b610e22377a40c567156b610319ffb9e024.tar.xz
fix two broken pactests because of date localization.
query002 and sync1100 had PACMAN_OUTPUT rules that looked at the build/install date (localized). Instead of looking at the month name, it will now check the year, which should be safer. I also had to add another pactest (query005) for keeping the same coverage. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
-rw-r--r--pactest/tests/query002.py6
-rw-r--r--pactest/tests/query005.py21
-rw-r--r--pactest/tests/sync1100.py2
3 files changed, 24 insertions, 5 deletions
diff --git a/pactest/tests/query002.py b/pactest/tests/query002.py
index c6a6c7d3..7d943644 100644
--- a/pactest/tests/query002.py
+++ b/pactest/tests/query002.py
@@ -7,9 +7,8 @@ p.groups = ["foo"]
p.url = "http://www.archlinux.org"
p.license = "GPL2"
p.arch = "i686"
-# test both old style and new style dates
+# test old style date
p.builddate = "Mon Oct 1 01:40:21 2007 UTC"
-p.installdate = "1196640127"
p.packager = "Arch Linux"
self.addpkg2db("local", p)
@@ -19,5 +18,4 @@ self.args = "-Qi %s" % p.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % p.name)
self.addrule("PACMAN_OUTPUT=%s" % p.desc)
-self.addrule("PACMAN_OUTPUT=Oct")
-self.addrule("PACMAN_OUTPUT=Dec")
+self.addrule("PACMAN_OUTPUT=2007")
diff --git a/pactest/tests/query005.py b/pactest/tests/query005.py
new file mode 100644
index 00000000..0c0bc51e
--- /dev/null
+++ b/pactest/tests/query005.py
@@ -0,0 +1,21 @@
+self.description = "Query info on a package"
+
+p = pmpkg("foobar")
+p.files = ["bin/foobar"]
+p.desc = "test description"
+p.groups = ["foo"]
+p.url = "http://www.archlinux.org"
+p.license = "GPL2"
+p.arch = "i686"
+# test new style date
+p.builddate = "1196640127"
+p.packager = "Arch Linux"
+
+self.addpkg2db("local", p)
+
+self.args = "-Qi %s" % p.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=%s" % p.name)
+self.addrule("PACMAN_OUTPUT=%s" % p.desc)
+self.addrule("PACMAN_OUTPUT=2007")
diff --git a/pactest/tests/sync1100.py b/pactest/tests/sync1100.py
index f0fb4f64..887b85e8 100644
--- a/pactest/tests/sync1100.py
+++ b/pactest/tests/sync1100.py
@@ -20,4 +20,4 @@ self.args = "-Si %s" % sp.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % sp.name)
self.addrule("PACMAN_OUTPUT=%s" % sp.desc)
-self.addrule("PACMAN_OUTPUT=Oct")
+self.addrule("PACMAN_OUTPUT=2007")