summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-10-14 18:52:17 -0500
committerDan McGee <dan@archlinux.org>2007-10-14 18:52:17 -0500
commit128b288ca7f396d3cbb6c9620807075274bdbe8e (patch)
tree9fb71278242f4a1901e2798239adea037c2681c7
parent3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 (diff)
downloadpacman-128b288ca7f396d3cbb6c9620807075274bdbe8e.tar.xz
Fix scriptlet pactest cases so they 'succeed' again
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--pactest/tests/scriptlet001.py5
-rw-r--r--pactest/tests/scriptlet002.py5
2 files changed, 10 insertions, 0 deletions
diff --git a/pactest/tests/scriptlet001.py b/pactest/tests/scriptlet001.py
index 73bb7691..3609d167 100644
--- a/pactest/tests/scriptlet001.py
+++ b/pactest/tests/scriptlet001.py
@@ -2,6 +2,10 @@
# validity of the scripts, only that they fire (or try to)
self.description = "Scriptlet test (pre/post install)"
+lpsh = pmpkg("sh")
+lpsh.files = ['bin/sh']
+self.addpkg2db("local", lpsh)
+
p1 = pmpkg("dummy")
p1.files = ['etc/dummy.conf']
p1.install['pre_install'] = "ls /etc";
@@ -12,5 +16,6 @@ self.addpkg(p1)
self.args = "--debug -U %s" % p1.filename()
self.addrule("PACMAN_RETCODE=0")
+self.addrule("FILE_EXIST=bin/sh")
self.addrule("PACMAN_OUTPUT=pre_install")
self.addrule("PACMAN_OUTPUT=post_install")
diff --git a/pactest/tests/scriptlet002.py b/pactest/tests/scriptlet002.py
index 0546511c..38ed5fd0 100644
--- a/pactest/tests/scriptlet002.py
+++ b/pactest/tests/scriptlet002.py
@@ -2,6 +2,10 @@
# validity of the scripts, only that they fire (or try to)
self.description = "Scriptlet test (pre/post remove)"
+lpsh = pmpkg("sh")
+lpsh.files = ['bin/sh']
+self.addpkg2db("local", lpsh)
+
p1 = pmpkg("dummy")
p1.files = ['etc/dummy.conf']
p1.install['pre_remove'] = "ls /etc";
@@ -12,5 +16,6 @@ self.addpkg2db("local", p1)
self.args = "--debug -R %s" % p1.name
self.addrule("PACMAN_RETCODE=0")
+self.addrule("FILE_EXIST=bin/sh")
self.addrule("PACMAN_OUTPUT=pre_remove")
self.addrule("PACMAN_OUTPUT=post_remove")