From bdfe232b8a269e5f63806bbdb7a3d8edf6b2ee7a Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Thu, 22 Mar 2007 08:30:18 +0000
Subject: Quick pactest changes: * Minor change to utils.py(grep) to make it
 cleaner * Added scriptlet check to verify scriptlet events happen

---
 pactest/tests/scriptlet001.py | 15 +++++++++++++++
 pactest/util.py               | 14 +++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 pactest/tests/scriptlet001.py

(limited to 'pactest')

diff --git a/pactest/tests/scriptlet001.py b/pactest/tests/scriptlet001.py
new file mode 100644
index 00000000..a749a114
--- /dev/null
+++ b/pactest/tests/scriptlet001.py
@@ -0,0 +1,15 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Scriptlet test (pre/post install)"
+
+p1 = pmpkg("dummy")
+p1.files = ['etc/dummy.conf']
+p1.install['pre_install'] = "ls /etc";
+p1.install['post_install'] = "ls /etc";
+self.addpkg(p1)
+
+self.args = "-U %s" % p1.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=pre_install")
+self.addrule("PACMAN_OUTPUT=post_install")
diff --git a/pactest/util.py b/pactest/util.py
index e445605e..574a59be 100755
--- a/pactest/util.py
+++ b/pactest/util.py
@@ -236,16 +236,12 @@ def diffmtime(mt1, mt2):
 #
 
 def grep(filename, pattern):
-    found = 0
-    fd = file(filename, "r")
-    while 1 and not found:
-        line = fd.readline()
-        if not line:
-            break
+    lines = file(filename, 'r').readlines()
+    for line in lines:
+        if not line: break
         if line.find(pattern) != -1:
-            found = 1
-    fd.close()
-    return found
+            return True
+    return False
 
 def mkdir(dir):
     if os.path.isdir(dir):
-- 
cgit v1.2.3-24-g4f1b