From 8cd41ec62bb081c8cdedafab2a96166d861939b5 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Thu, 23 Oct 2014 02:54:50 -0400 Subject: tests/pacman-db-upgrade-v9: set additional paths --config does not respect root, causing pacman-db-upgrade to read the local pacman.conf rather than the one in the test root. Also add a rule to ensure the ALPM_DB_VERSION file is actually being created. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/scripts/pacman-db-upgrade-v9.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/scripts/pacman-db-upgrade-v9.py b/test/scripts/pacman-db-upgrade-v9.py index dc6f97d6..a54319ff 100644 --- a/test/scripts/pacman-db-upgrade-v9.py +++ b/test/scripts/pacman-db-upgrade-v9.py @@ -9,9 +9,13 @@ fpkg.backup = ["mnt/foo"] self.addpkg2db("local", fpkg) self.dbver = 8 -self.cmd = ["pacman-db-upgrade", "--root", self.root + "/"] +self.cmd = ["pacman-db-upgrade", + "--root", self.rootdir(), + "--dbpath", self.dbdir(), + "--config", self.configfile() ] self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_EXIST=var/lib/pacman/local/ALPM_DB_VERSION") self.addrule("PKG_BACKUP=filesystem|mnt_real/subdir/foo") self.addrule("PKG_FILES=filesystem|mnt_real/") self.addrule("PKG_FILES=filesystem|mnt_real/subdir/") -- cgit v1.2.3-70-g09d2