The -Qk test (001) validates the existence of the package files (which were installed to the filesystem by the framework because the package was added to the "local" db). The -Qkk test (002) does not validate any file's properties - it can only check that the pacman run produces the expected warning message saying that the package lacks an mtree. Further tests will require modifications to the testing framework to allow intentional damage to the filesystem and generating an mtree. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> --- test/pacman/tests/TESTS | 2 ++ test/pacman/tests/querycheck001.py | 15 +++++++++++++++ test/pacman/tests/querycheck002.py | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fc6a7e8..0997f58 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -88,6 +88,8 @@ TESTS += test/pacman/tests/query007.py TESTS += test/pacman/tests/query010.py TESTS += test/pacman/tests/query011.py TESTS += test/pacman/tests/query012.py +TESTS += test/pacman/tests/querycheck001.py +TESTS += test/pacman/tests/querycheck002.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck001.py b/test/pacman/tests/querycheck001.py new file mode 100644 index 0000000..21bcba2 --- /dev/null +++ b/test/pacman/tests/querycheck001.py @@ -0,0 +1,15 @@ +self.description = "Query--check files, all there" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +self.addpkg2db("local",pkg) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PACMAN_OUTPUT=warning") diff --git a/test/pacman/tests/querycheck002.py b/test/pacman/tests/querycheck002.py new file mode 100644 index 0000000..579d4d1 --- /dev/null +++ b/test/pacman/tests/querycheck002.py @@ -0,0 +1,15 @@ +self.description = "Query--check mtree, no mtree" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +self.addpkg2db("local",pkg) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=dummy: no mtree file") -- 1.8.4.2

Making util.mkfile responsible for calling os.utime avoids duplication of the code in both pmpkg and pmtest, and also the unnecessary repetition of the os.path.join (inside util.mkfile and again in pmpkg/pmtest). This change also eases the way forward for the more complicated utime code which is needed to support mtree testing. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> --- test/pacman/pmpkg.py | 5 +---- test/pacman/pmtest.py | 5 +---- test/pacman/util.py | 4 +++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index fd469b1..db97449 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -192,10 +192,7 @@ def install_package(self, root): """Install the package in the given root.""" self.runscript(root, "pre_install") for f in self.files: - util.mkfile(root, f, f) - path = os.path.join(root, f) - if os.path.isfile(path): - os.utime(path, (355, 355)) + util.mkfile(root, f, f, True) self.runscript(root, "post_install") def filelist(self): diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index a1f3645d..9968dce 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -175,10 +175,7 @@ def generate(self, pacman): vprint(" Populating file system") for f in self.filesystem: vprint("\t%s" % f) - util.mkfile(self.root, f, f) - path = os.path.join(self.root, f) - if os.path.isfile(path): - os.utime(path, (355, 355)) + util.mkfile(self.root, f, f, True) for pkg in self.db["local"].pkgs: vprint("\tinstalling %s" % pkg.fullname()) pkg.install_package(self.root) diff --git a/test/pacman/util.py b/test/pacman/util.py index ab5a6f4..beb7e3d 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -77,7 +77,7 @@ def getfileinfo(filename): data["filename"] = filename return data -def mkfile(base, name, data=""): +def mkfile(base, name, data="", utime=False): info = getfileinfo(name) filename = info["filename"] @@ -95,6 +95,8 @@ def mkfile(base, name, data=""): os.symlink(info["link"], path) else: writedata(path, data) + if utime: + os.utime(path, (355, 355)) if info["perms"]: os.chmod(path, info["perms"]) -- 1.8.4.2

The first test (007) checks every permutation of file type mismatch that -Qkk warns about. The second (008) checks for the other types of mismatch (permissions, modification time, size, and symlink path) that the test framework can set up without root permission. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> --- test/pacman/tests/TESTS | 2 ++ test/pacman/tests/querycheck007.py | 25 +++++++++++++++++++++++++ test/pacman/tests/querycheck008.py | 25 +++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 test/pacman/tests/querycheck007.py create mode 100644 test/pacman/tests/querycheck008.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index c460fe0..abe0558 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -94,6 +94,8 @@ TESTS += test/pacman/tests/querycheck003.py TESTS += test/pacman/tests/querycheck004.py TESTS += test/pacman/tests/querycheck005.py TESTS += test/pacman/tests/querycheck006.py +TESTS += test/pacman/tests/querycheck007.py +TESTS += test/pacman/tests/querycheck008.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck007.py b/test/pacman/tests/querycheck007.py new file mode 100644 index 0000000..9a2c765 --- /dev/null +++ b/test/pacman/tests/querycheck007.py @@ -0,0 +1,25 @@ +self.description = "Query--check mtree, bad types" + +pkg = pmpkg("dummy") +pkg.files = ["dummy/z"] +pkg.makemtree = True +script = [] +for file, mangle in [ + ("dummy/d1/", ["rmdir", "touch"]), + ("dummy/d2/", ["rmdir", "ln -s z"]), + ("dummy/f1", ["rm", "mkdir"]), + ("dummy/f2", ["rm", "ln -s z"]), + ("dummy/l1 -> z", ["rm", "mkdir"]), + ("dummy/l2 -> z", ["rm", "touch"])]: + pkg.files.append(file) + parsed = pkg.parse_filename(file).rstrip('/') + for cmd in mangle: + script.append(cmd +" ../"+parsed) + self.addrule("PACMAN_OUTPUT=%s .File type mismatch" % parsed) +pkg.install['post_install'] = ";".join(script) +self.addpkg2db("local",pkg) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_OUTPUT=, 6 altered files") diff --git a/test/pacman/tests/querycheck008.py b/test/pacman/tests/querycheck008.py new file mode 100644 index 0000000..538eb75 --- /dev/null +++ b/test/pacman/tests/querycheck008.py @@ -0,0 +1,25 @@ +self.description = "Query--check mtree, bad perms+time+size+link" + +pkg = pmpkg("dummy") +pkg.files = ["dummy/z"] +pkg.makemtree = True +script = [] +for file, err, mangle in [ + #("dummy/uid", "UID", ["chown ?"]),#needs root + #("dummy/gid", "GID", ["chgrp ?"]),#needs root + ("dummy/mode", "Permissions", ["chmod 600"]), + ("dummy/mtime", "Modification time", ["touch"]), + ("dummy/size", "Size", ["echo x >"]), + ("dummy/link -> size", "Symlink path", ["rm", "ln -s z"])]: + pkg.files.append(file) + parsed = pkg.parse_filename(file) + for cmd in mangle: + script.append(cmd +" ../"+parsed) + self.addrule("PACMAN_OUTPUT=%s .%s mismatch" % (parsed,err)) +pkg.install['post_install'] = ";".join(script) +self.addpkg2db("local",pkg) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_OUTPUT=, 4 altered files") -- 1.8.4.2

On 11/11/13 at 06:47am, Jeremy Heiner wrote:

pmpkg.install_package (which is called by the framework to populate the filesystem with "local" db packages) now executes any pre_install and/or post_install scripts it finds. Prior to this commit no unit test had a "local" package with such a script. The two new tests in this commit use post_install to remove some installed files.

As with the previous commit, the -Qk test (003) validates the filesystem (warning about the missing files), while the -Qkk test (004) can only check for the warning about the lack of an mtree.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> --- test/pacman/pmpkg.py | 13 +++++++++++++ test/pacman/tests/TESTS | 2 ++ test/pacman/tests/querycheck003.py | 19 +++++++++++++++++++ test/pacman/tests/querycheck004.py | 17 +++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 test/pacman/tests/querycheck003.py create mode 100644 test/pacman/tests/querycheck004.py

diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 6f7ae6e..fd469b1 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -22,6 +22,7 @@ import stat import shutil from StringIO import StringIO +import subprocess import tarfile

import util @@ -177,13 +178,25 @@ def makepkg(self, path):

tar.close()

+ def runscript(self, root, name): + script = self.install[name] + if script: + util.vprint("running %s script: %s" % (name, script)) + # note: there are differences between the environment the script + # gets from here versus the one the pacman binary would give it. + # in particular there's no chroot, so use relative paths. + subprocess.call(["sh", "-c", script], + cwd=os.path.join(root,util.TMPDIR)) +

One of the main reasons I suggested adding install script support for this was so that they would work the same as scripts run by pacman and therefore be easy to write and understand. At the very least, they should be run in root, not TMPDIR and honor env["scriptlet-shell"]. This should also be run with fakeroot (use -i and -s to save state between invocations) and be run inside a fake chroot. The only downside I see is the need to copy binaries into the test chroot. It looks like your tests would require us to copy at least chown, chmod, rm, touch, and ln into the chroot. Is there any problem with copying the additional binaries?

def install_package(self, root): """Install the package in the given root.""" + self.runscript(root, "pre_install") for f in self.files: util.mkfile(root, f, f) path = os.path.join(root, f) if os.path.isfile(path): os.utime(path, (355, 355)) + self.runscript(root, "post_install")

def filelist(self): """Generate a list of package files."""

On 11/11/13 21:47, Jeremy Heiner wrote:

The -Qk test (001) validates the existence of the package files (which were installed to the filesystem by the framework because the package was added to the "local" db).

The -Qkk test (002) does not validate any file's properties - it can only check that the pacman run produces the expected warning message saying that the package lacks an mtree.

Further tests will require modifications to the testing framework to allow intentional damage to the filesystem and generating an mtree.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> ---

Pulled.

test/pacman/tests/TESTS | 2 ++ test/pacman/tests/querycheck001.py | 15 +++++++++++++++ test/pacman/tests/querycheck002.py | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py

diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fc6a7e8..0997f58 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -88,6 +88,8 @@ TESTS += test/pacman/tests/query007.py TESTS += test/pacman/tests/query010.py TESTS += test/pacman/tests/query011.py TESTS += test/pacman/tests/query012.py +TESTS += test/pacman/tests/querycheck001.py +TESTS += test/pacman/tests/querycheck002.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck001.py b/test/pacman/tests/querycheck001.py new file mode 100644 index 0000000..21bcba2 --- /dev/null +++ b/test/pacman/tests/querycheck001.py @@ -0,0 +1,15 @@ +self.description = "Query--check files, all there" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +self.addpkg2db("local",pkg) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PACMAN_OUTPUT=warning") diff --git a/test/pacman/tests/querycheck002.py b/test/pacman/tests/querycheck002.py new file mode 100644 index 0000000..579d4d1 --- /dev/null +++ b/test/pacman/tests/querycheck002.py @@ -0,0 +1,15 @@ +self.description = "Query--check mtree, no mtree" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +self.addpkg2db("local",pkg) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=dummy: no mtree file")

On 11/11/13 21:47, Jeremy Heiner wrote:

The framework will now generate mtree data when the pmpkg.makemtree is set to True, but only for "local" packages. Since the mtree data is only used by -Qkk, and this change is sufficient to test that function, there seems to be no reason to generate mtree data for other packages. If that becomes a requirement in the future there are comments in the code that sketch out an implemention for that.

The two new unit tests are similar to the previous -Qkk tests (005 is like 002, and 006 is like 004), but with mtree data. So the filesystem is actually validated against the mtree (instead of merely checking for the warning about a lacking mtree).

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> --- test/pacman/pmdb.py | 3 ++ test/pacman/pmpkg.py | 18 ++++++++++++ test/pacman/tests/TESTS | 2 ++ test/pacman/tests/querycheck005.py | 16 +++++++++++ test/pacman/tests/querycheck006.py | 20 +++++++++++++ test/pacman/util.py | 57 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 116 insertions(+) create mode 100644 test/pacman/tests/querycheck005.py create mode 100644 test/pacman/tests/querycheck006.py

diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 53de91e..088e284 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -224,6 +224,9 @@ def db_write(self, pkg): make_section(data, "BACKUP", pkg.local_backup_entries()) entry["files"] = "\n".join(data)

+ if pkg.mtreedata: + entry["mtree"] = pkg.mtreedata + if any(pkg.install.values()): entry["install"] = pkg.installfile()

diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index db97449..25e841a 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -60,6 +60,8 @@ def __init__(self, name, version = "1.0-1"): # files self.files = [] self.backup = [] + self.makemtree = False # True => finalize generates mtreedata + self.mtreedata = "" # you can set this, but makemtree is easier # install self.install = { "pre_install": "", @@ -145,6 +147,19 @@ def makepkg(self, path): if any(self.install.values()): archive_files.append((".INSTALL", self.installfile()))

+ # .MTREE + if self.mtreedata: + raise NotImplementedError("attempt to put mtree into tar") + # TODO: they work great in local dbs, but not in tar'd pkgs. + # it seems unlikely that any test will ever need to, but: + # easiest solution seems to be to hack the 'Generate package + # file system' loop just below to copy the attributes from + # the mtreedata over to the TarInfo fields. pulling the data + # out with re.search shouldn't be too hard. put that code + # over in util so it gets updated with the other mtree code. + # then remove the raise and uncomment the following line: + # archive_files.append((".MTREE", self.mtreedata)) + self.path = os.path.join(path, self.filename()) util.mkdir(os.path.dirname(self.path))

@@ -226,6 +241,9 @@ def finalize(self): name = os.path.dirname(name) self.files.sort()

+ if self.makemtree: + self.mtreedata = util.mtree(self.files) + self.finalized = True

def local_backup_entries(self): diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index f4e6caf..c460fe0 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -92,6 +92,8 @@ TESTS += test/pacman/tests/querycheck001.py TESTS += test/pacman/tests/querycheck002.py TESTS += test/pacman/tests/querycheck003.py TESTS += test/pacman/tests/querycheck004.py +TESTS += test/pacman/tests/querycheck005.py +TESTS += test/pacman/tests/querycheck006.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck005.py b/test/pacman/tests/querycheck005.py new file mode 100644 index 0000000..95c776d --- /dev/null +++ b/test/pacman/tests/querycheck005.py @@ -0,0 +1,16 @@ +self.description = "Query--check mtree, all there" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +pkg.makemtree = True +self.addpkg2db("local",pkg) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PACMAN_OUTPUT=dummy: no mtree file") diff --git a/test/pacman/tests/querycheck006.py b/test/pacman/tests/querycheck006.py new file mode 100644 index 0000000..879fd00 --- /dev/null +++ b/test/pacman/tests/querycheck006.py @@ -0,0 +1,20 @@ +self.description = "Query--check mtree, missing" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +pkg.makemtree = True +pkg.install['post_install'] = "rm -r ../usr/share/dummy/*" +self.addpkg2db("local",pkg) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_OUTPUT=/usr/share/dummy/C .No such file") +self.addrule("PACMAN_OUTPUT=/usr/share/dummy/C/msgs .No such file") +self.addrule("PACMAN_OUTPUT=/usr/share/dummy/en .No such file") +self.addrule("PACMAN_OUTPUT=, 3 altered files") diff --git a/test/pacman/util.py b/test/pacman/util.py index beb7e3d..2158b80 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -20,6 +20,8 @@ import os import re import hashlib +import subprocess +import sys

import tap

@@ -93,6 +95,11 @@ def mkfile(base, name, data="", utime=False):

if info["islink"]: os.symlink(info["link"], path) + if utime: + if sys.hexversion < 0x03030000: + subprocess.call(["touch","-ht","196912311905.55",path]) + else: + os.utime(path, (355,355), follow_symlinks=False) else: writedata(path, data) if utime: @@ -158,6 +165,56 @@ def mkmd5sum(data):

# +# mtree +# obviously not a full implementation of the spec (e.g. no +# quoting of paths), but just enough for a few tests. +# freebsd mtree(5) has a bit more detail than arch or openbsd. +# scripts/makepkg calls bsdtar to build mtrees at line 1890.

Comments referencing lines are awful because the line number will change. Can we not just call bsdtar to generate these using the exact command makepkg does?

+# + +def mtree(files): + + lines = ["#mtree"] # no version (ala bsdtar) + for name in files: + info = getfileinfo(name) + filename = info["filename"] + + if info["isdir"]: + filename = filename.rstrip("/") + mode = info["perms"] if info["hasperms"] else 0o755 + attrs = ("type=dir mode=%o" + % (mode)) + + elif info["islink"]: + mode = info["perms"] if info["hasperms"] else 0o777 + attrs = ("type=link time=355.000000000" + " mode=%o link=%s" + % (mode, info["link"])) + + else: + mode = info["perms"] if info["hasperms"] else 0o644 + contents = name + "\n" + md5 = hashlib.md5(contents).hexdigest() + sha256 = hashlib.sha256(contents).hexdigest() + attrs = ("type=file time=355.000000000" + " mode=%o size=%d md5digest=%s sha256digest=%s" + % (mode, len(contents), md5, sha256)) + + lines.append("./%s uid=0 gid=0 %s" % (filename, attrs)) + + mtree = "\n".join(lines)+"\n" + + # scripts/makepkg compresses the mtree (via bsdtar using gzip). + # python's gzip always opens a file (can't make it use StringIO). + # gzip uses zlib, but if we zlib.compress(mtree) it causes libalpm + # to reject the mtree with "Unrecognized archive format". + # fortunately libalpm reads the uncompressed mtree files just fine, + # so we don't have to jump through any hoops to get it compressed. + + return mtree + + +# # Miscellaneous #

On 11/11/13 21:47, Jeremy Heiner wrote:

Making util.mkfile responsible for calling os.utime avoids duplication of the code in both pmpkg and pmtest, and also the unnecessary repetition of the os.path.join (inside util.mkfile and again in pmpkg/pmtest).

This change also eases the way forward for the more complicated utime code which is needed to support mtree testing.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com>

This seems fine to me. It appears dependent on changes Patch 2/5 in this series (or at least it did not apply cleanly here...), so it will need adjusted.

--- test/pacman/pmpkg.py | 5 +---- test/pacman/pmtest.py | 5 +---- test/pacman/util.py | 4 +++- 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index fd469b1..db97449 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -192,10 +192,7 @@ def install_package(self, root): """Install the package in the given root.""" self.runscript(root, "pre_install") for f in self.files: - util.mkfile(root, f, f) - path = os.path.join(root, f) - if os.path.isfile(path): - os.utime(path, (355, 355)) + util.mkfile(root, f, f, True) self.runscript(root, "post_install")

def filelist(self): diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index a1f3645d..9968dce 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -175,10 +175,7 @@ def generate(self, pacman): vprint(" Populating file system") for f in self.filesystem: vprint("\t%s" % f) - util.mkfile(self.root, f, f) - path = os.path.join(self.root, f) - if os.path.isfile(path): - os.utime(path, (355, 355)) + util.mkfile(self.root, f, f, True) for pkg in self.db["local"].pkgs: vprint("\tinstalling %s" % pkg.fullname()) pkg.install_package(self.root) diff --git a/test/pacman/util.py b/test/pacman/util.py index ab5a6f4..beb7e3d 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -77,7 +77,7 @@ def getfileinfo(filename): data["filename"] = filename return data

-def mkfile(base, name, data=""): +def mkfile(base, name, data="", utime=False): info = getfileinfo(name) filename = info["filename"]

@@ -95,6 +95,8 @@ def mkfile(base, name, data=""): os.symlink(info["link"], path) else: writedata(path, data) + if utime: + os.utime(path, (355, 355))

if info["perms"]: os.chmod(path, info["perms"])

On 31/12/13 04:17, Andrew Gregory wrote:

On 11/11/13 at 06:47am, Jeremy Heiner wrote:

...

The -Qk test (001) validates the existence of the package files (which were installed to the filesystem by the framework because the package was added to the "local" db).

The -Qkk test (002) does not validate any file's properties - it can only check that the pacman run produces the expected warning message saying that the package lacks an mtree.

Further tests will require modifications to the testing framework to allow intentional damage to the filesystem and generating an mtree.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> --- test/pacman/tests/TESTS | 2 ++ test/pacman/tests/querycheck001.py | 15 +++++++++++++++ test/pacman/tests/querycheck002.py | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py

diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fc6a7e8..0997f58 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -88,6 +88,8 @@ TESTS += test/pacman/tests/query007.py TESTS += test/pacman/tests/query010.py TESTS += test/pacman/tests/query011.py TESTS += test/pacman/tests/query012.py +TESTS += test/pacman/tests/querycheck001.py +TESTS += test/pacman/tests/querycheck002.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck001.py b/test/pacman/tests/querycheck001.py new file mode 100644 index 0000000..21bcba2 --- /dev/null +++ b/test/pacman/tests/querycheck001.py @@ -0,0 +1,15 @@ +self.description = "Query--check files, all there" + +pkg = pmpkg("dummy") +pkg.files = [ + "usr/lib/libdummy.so.0", + "usr/lib/libdummy.so -> libdummy.so.0", + "usr/share/dummy/C/", + "usr/share/dummy/C/msgs", + "usr/share/dummy/en -> C"] +self.addpkg2db("local",pkg) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PACMAN_OUTPUT=warning")

This fails if pacman is built without libcurl.

Change made: -self.addrule("!PACMAN_OUTPUT=warning") +self.addrule("!PACMAN_OUTPUT=warning.*(No such file or directory)")