Add a lot more tests (and some pactest fixes) to -Si and -Qi tests

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 33 insertions, 8 deletions

diff --git a/pactest/pmdb.py b/pactest/pmdb.py
index f927b4b8..ed552dbf 100755
--- a/pactest/pmdb.py
+++ b/pactest/pmdb.py
@@ -236,19 +236,19 @@ class pmdb:
             data.append(_mksection("DESC", pkg.desc))
         if pkg.groups:
             data.append(_mksection("GROUPS", pkg.groups))
+        if pkg.license:
+            data.append(_mksection("LICENSE", pkg.license))
+        if pkg.arch:
+            data.append(_mksection("ARCH", pkg.arch))
+        if pkg.builddate:
+            data.append(_mksection("BUILDDATE", pkg.builddate))
+        if pkg.packager:
+            data.append(_mksection("PACKAGER", pkg.packager))
         if self.treename == "local":
             if pkg.url:
                 data.append(_mksection("URL", pkg.url))
-            if pkg.license:
-                data.append(_mksection("LICENSE", pkg.license))
-            if pkg.arch:
-                data.append(_mksection("ARCH", pkg.arch))
-            if pkg.builddate:
-                data.append(_mksection("BUILDDATE", pkg.builddate))
             if pkg.installdate:
                 data.append(_mksection("INSTALLDATE", pkg.installdate))
-            if pkg.packager:
-                data.append(_mksection("PACKAGER", pkg.packager))
             if pkg.size:
                 data.append(_mksection("SIZE", pkg.size))
             if pkg.reason:
diff --git a/pactest/tests/query002.py b/pactest/tests/query002.py
index 830936b4..c6a6c7d3 100644
--- a/pactest/tests/query002.py
+++ b/pactest/tests/query002.py
@@ -2,9 +2,22 @@ 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 both old style and new style dates
+p.builddate = "Mon Oct  1 01:40:21 2007 UTC"
+p.installdate = "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=Oct")
+self.addrule("PACMAN_OUTPUT=Dec")
diff --git a/pactest/tests/sync1100.py b/pactest/tests/sync1100.py
index 1f8fa057..f0fb4f64 100644
--- a/pactest/tests/sync1100.py
+++ b/pactest/tests/sync1100.py
@@ -3,9 +3,21 @@ self.description = "Get info on package from a sync db"
 sp = pmpkg("dummy")
 sp.files = ["bin/dummy",
             "usr/man/man1/dummy.1"]
+sp.desc = "test description"
+sp.groups = ["foo"]
+sp.url = "http://www.archlinux.org"
+sp.license = "GPL2"
+sp.arch = "i686"
+# test both old style and new style dates
+sp.builddate = "Mon Oct  1 01:40:21 2007 UTC"
+sp.packager = "Arch Linux"
+sp.md5sum = "00000000000000000000000000000000"
+
 self.addpkg2db("sync", sp)
 
 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")