moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

pactest: accept test names without a switch

Browse Source 
This removes the --test switch, making it easier to call pactest from
a test harness.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-07-29 15:34:04 -04:00 committed by Allan McRae
parent 9263cc5874
commit 228221003d
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -28,10 +28,10 @@ check-local: test-pacman test-pacsort test-vercmp test-parseopts
test-pacman: test/pacman src/pacman test-pacman: test/pacman src/pacman
$(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \
--test $(top_srcdir)/test/pacman/tests/*.py \
--scriptlet-shell $(SCRIPTLET_SHELL) \ --scriptlet-shell $(SCRIPTLET_SHELL) \
--ldconfig $(LDCONFIG) \ --ldconfig $(LDCONFIG) \
-p $(top_builddir)/src/pacman/pacman -p $(top_builddir)/src/pacman/pacman \
$(top_srcdir)/test/pacman/tests/*.py
test-pacsort: test/util src/util test-pacsort: test/util src/util
$(BASH_SHELL) $(top_srcdir)/test/util/pacsorttest.sh \ $(BASH_SHELL) $(top_srcdir)/test/util/pacsorttest.sh \

21
test/pacman/pactest.py
View File

@ -35,21 +35,8 @@ __version__ = "0.4"
def resolve_binary_path(option, opt_str, value, parser): def resolve_binary_path(option, opt_str, value, parser):
setattr(parser.values, option.dest, os.path.abspath(value)) setattr(parser.values, option.dest, os.path.abspath(value))
def glob_tests(option, opt_str, value, parser):
idx = 0
globlist = []
# maintain the idx so we can modify rargs
while idx < len(parser.rargs) and \
not parser.rargs[idx].startswith('-'):
globlist += glob.glob(parser.rargs[idx])
idx += 1
parser.rargs = parser.rargs[idx:]
setattr(parser.values, option.dest, globlist)
def create_parser(): def create_parser():
usage = "usage: %prog [options] [[--test <path/to/testfile.py>] ...]" usage = "usage: %prog [options] <path/to/testfile.py>..."
description = "Runs automated tests on the pacman binary. Tests are " \ description = "Runs automated tests on the pacman binary. Tests are " \
"described using an easy python syntax, and several can be " \ "described using an easy python syntax, and several can be " \
"ran at once." "ran at once."
@ -65,9 +52,6 @@ def create_parser():
callback = resolve_binary_path, type = "string", callback = resolve_binary_path, type = "string",
dest = "bin", default = "pacman", dest = "bin", default = "pacman",
help = "specify location of the pacman binary") help = "specify location of the pacman binary")
parser.add_option("-t", "--test", action = "callback",
callback = glob_tests, dest = "testcases",
help = "specify test case(s)")
parser.add_option("--keep-root", action = "store_true", parser.add_option("--keep-root", action = "store_true",
dest = "keeproot", default = False, dest = "keeproot", default = False,
help = "don't remove the generated pacman root filesystem") help = "don't remove the generated pacman root filesystem")
@ -110,6 +94,9 @@ if __name__ == "__main__":
env.pacman["scriptlet-shell"] = opts.scriptletshell env.pacman["scriptlet-shell"] = opts.scriptletshell
env.pacman["ldconfig"] = opts.ldconfig env.pacman["ldconfig"] = opts.ldconfig
opts.testcases = []
for path in args:
opts.testcases += glob.glob(path)
if opts.testcases is None or len(opts.testcases) == 0: if opts.testcases is None or len(opts.testcases) == 0:
tap.bail("no tests defined, nothing to do") tap.bail("no tests defined, nothing to do")
os.rmdir(root_path) os.rmdir(root_path)