diff options
| author | Dave Reisner <d@falconindy.com> | 2011-06-24 14:55:32 -0400 |
|---|---|---|
| committer | Dave Reisner <d@falconindy.com> | 2011-06-24 14:55:32 -0400 |
| commit | 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570 (patch) | |
| tree | bb330206ea0caa95c9d337a6c5b4b99b6034e756 /test | |
| parent | 8581694ceb63f4ed2854206b38574599c3d9df28 (diff) | |
| parent | e06586ceb49a0dc7e59996ae3a1483337d2ada05 (diff) | |
| download | pacman-2d32a9a3a348d25d6d0f3d12752399bf7fdf6570.tar.xz | |
Merge branch 'master' of git://projects.archlinux.org/pacman
* 'master' of git://projects.archlinux.org/pacman:
pactree: carry a list of databases for dep resolution
makepkg: Remove a lone quotation mark
makepkg: remove the cleancache option
Don't require a transaction for sync DB updates
Move locking functions to handle
Add a 'valid' flag to the database object
Move database 'version' check to registration time
Do database signature checking at load time
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/ignore007.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/sign001.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/pacman/tests/ignore007.py b/test/pacman/tests/ignore007.py index 90ff4ef6..7670e770 100644 --- a/test/pacman/tests/ignore007.py +++ b/test/pacman/tests/ignore007.py @@ -18,4 +18,4 @@ self.args = "--ask=1 -S grp" self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=%s" % pkg1.name) self.addrule("PKG_EXIST=%s" % pkg2.name) -self.addrule("PACMAN_OUTPUT=is in IgnorePkg") +self.addrule("PKG_EXIST=%s" % pkg3.name) diff --git a/test/pacman/tests/sign001.py b/test/pacman/tests/sign001.py index 0ae417b7..14add09c 100644 --- a/test/pacman/tests/sign001.py +++ b/test/pacman/tests/sign001.py @@ -1,8 +1,8 @@ -self.description = "Add a signature to a package DB" +self.description = "Add a bogus signature to a package DB" sp = pmpkg("pkg1") sp.pgpsig = "asdfasdfsdfasdfsdafasdfsdfasd" -self.addpkg2db("sync+Always", sp) +self.addpkg2db("sync+Optional", sp) self.args = "-Ss" |