moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

pactest: use actual regexes in OUTPUT rules 

I managed to just make deptest001.py fail by changing a DEBUG-level
logger in commit b12be99c89. This should not be this fickle. Enhance the
OUTPUT rule to use an actual Python re object when looking for matches,
and make a lot of the rules use stronger patterns to match with.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-03-01 14:24:13 -06:00
parent b12be99c89
commit d68635e7c2
14 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/pacman/tests/deptest001.py
View File

@ -10,7 +10,7 @@
self.args = "-T pkg1 pkg2 pkg3\>2.1 prov\>\=3.0" self.args = "-T pkg1 pkg2 pkg3\>2.1 prov\>\=3.0"
self.addrule("PACMAN_RETCODE=127") self.addrule("PACMAN_RETCODE=127")
self.addrule("!PACMAN_OUTPUT=pkg1") self.addrule("!PACMAN_OUTPUT=^pkg1")
self.addrule("PACMAN_OUTPUT=pkg2") self.addrule("PACMAN_OUTPUT=^pkg2")
self.addrule("PACMAN_OUTPUT=pkg3") self.addrule("PACMAN_OUTPUT=^pkg3")
self.addrule("!PACMAN_OUTPUT=prov") self.addrule("!PACMAN_OUTPUT=^prov")

2
test/pacman/tests/ignore007.py
View File

@ -18,4 +18,4 @@
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=%s" % pkg1.name) self.addrule("!PKG_EXIST=%s" % pkg1.name)
self.addrule("PKG_EXIST=%s" % pkg2.name) self.addrule("PKG_EXIST=%s" % pkg2.name)
self.addrule("PACMAN_OUTPUT=IgnorePkg") self.addrule("PACMAN_OUTPUT=is in IgnorePkg")

2
test/pacman/tests/ldconfig001.py
View File

@ -9,4 +9,4 @@
self.args = "--debug -U %s" % p.filename() self.args = "--debug -U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=ldconfig") self.addrule("PACMAN_OUTPUT=running ldconfig")

2
test/pacman/tests/ldconfig002.py
View File

@ -13,4 +13,4 @@
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=dummy|1.0-2") self.addrule("PKG_VERSION=dummy|1.0-2")
self.addrule("PACMAN_OUTPUT=ldconfig") self.addrule("PACMAN_OUTPUT=running ldconfig")

2
test/pacman/tests/ldconfig003.py
View File

@ -11,4 +11,4 @@
self.args = "--debug -S %s" % sp.name self.args = "--debug -S %s" % sp.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=ldconfig") self.addrule("PACMAN_OUTPUT=running ldconfig")

2
test/pacman/tests/query001.py
View File

@ -7,4 +7,4 @@
self.args = "-Q %s" % p.name self.args = "-Q %s" % p.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % p.name) self.addrule("PACMAN_OUTPUT=^%s" % p.name)

6
test/pacman/tests/query002.py
View File

@ -16,6 +16,6 @@
self.args = "-Qi %s" % p.name self.args = "-Qi %s" % p.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % p.name) self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name)
self.addrule("PACMAN_OUTPUT=%s" % p.desc) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc)
self.addrule("PACMAN_OUTPUT=2007") self.addrule("PACMAN_OUTPUT=^Build Date.*2007")

2
test/pacman/tests/query003.py
View File

@ -8,4 +8,4 @@
self.args = "-Qs %s" % p.name self.args = "-Qs %s" % p.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % p.name) self.addrule("PACMAN_OUTPUT=^local/%s" % p.name)

2
test/pacman/tests/query004.py
View File

@ -7,4 +7,4 @@
self.args = "-Q %s" % p.name self.args = "-Q %s" % p.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % p.name) self.addrule("PACMAN_OUTPUT=^%s" % p.name)

6
test/pacman/tests/query005.py
View File

@ -16,6 +16,6 @@
self.args = "-Qi %s" % p.name self.args = "-Qi %s" % p.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % p.name) self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name)
self.addrule("PACMAN_OUTPUT=%s" % p.desc) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc)
self.addrule("PACMAN_OUTPUT=2007") self.addrule("PACMAN_OUTPUT=^Build Date.*2007")

6
test/pacman/tests/sync1100.py
View File

@ -18,6 +18,6 @@
self.args = "-Si %s" % sp.name self.args = "-Si %s" % sp.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % sp.name) self.addrule("PACMAN_OUTPUT=^Name.*%s" % sp.name)
self.addrule("PACMAN_OUTPUT=%s" % sp.desc) self.addrule("PACMAN_OUTPUT=^Description.*%s" % sp.desc)
self.addrule("PACMAN_OUTPUT=2007") self.addrule("PACMAN_OUTPUT=^Build Date.*2007")

2
test/pacman/tests/sync1101.py
View File

@ -9,4 +9,4 @@
self.args = "-Ss %s" % sp.name self.args = "-Ss %s" % sp.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % sp.name) self.addrule("PACMAN_OUTPUT=^sync/%s" % sp.name)

2
test/pacman/tests/sync1103.py
View File

@ -8,4 +8,4 @@
self.args = "-Sl" self.args = "-Sl"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s" % sp.name) self.addrule("PACMAN_OUTPUT=^sync %s" % sp.name)

11
test/pacman/util.py
View File

@ -17,6 +17,7 @@
import os import os
import re
import hashlib import hashlib
import stat import stat
@ -194,11 +195,13 @@ def which(filename):
return None return None
def grep(filename, pattern): def grep(filename, pattern):
lines = file(filename, 'r').readlines() pat = re.compile(pattern)
for line in lines: myfile = open(filename, 'r')
if not line: break for line in myfile:
if line.find(pattern) != -1: if pat.search(line):
myfile.close()
return True return True
myfile.close()
return False return False
def mkdir(path): def mkdir(path):