From 73aa6b610e22377a40c567156b610319ffb9e024 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sat, 22 Dec 2007 20:32:57 +0100 Subject: 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 --- pactest/tests/query002.py | 6 ++---- pactest/tests/query005.py | 21 +++++++++++++++++++++ pactest/tests/sync1100.py | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 pactest/tests/query005.py 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") -- cgit v1.2.3-24-g4f1b