summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-07-29 21:34:04 +0200
committerAllan McRae <allan@archlinux.org>2013-08-21 03:00:18 +0200
commit228221003df40fa0782656d0e32d6ad072a4eec1 (patch)
tree620c7e5e18b95ff93cd2d60042915a6ca5387fab
parent9263cc58747a1b2ed5a345e5b35014b44decd444 (diff)
downloadpacman-228221003df40fa0782656d0e32d6ad072a4eec1.tar.gz
pacman-228221003df40fa0782656d0e32d6ad072a4eec1.tar.xz
pactest: accept test names without a switch
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>
-rw-r--r--Makefile.am4
-rwxr-xr-xtest/pacman/pactest.py21
2 files changed, 6 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index 28f7f8f9..1adf0f89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,10 +28,10 @@ check-local: test-pacman test-pacsort test-vercmp test-parseopts
test-pacman: test/pacman src/pacman
$(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \
- --test $(top_srcdir)/test/pacman/tests/*.py \
--scriptlet-shell $(SCRIPTLET_SHELL) \
--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
$(BASH_SHELL) $(top_srcdir)/test/util/pacsorttest.sh \
diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py
index fe04c2b3..e92864d7 100755
--- a/test/pacman/pactest.py
+++ b/test/pacman/pactest.py
@@ -35,21 +35,8 @@ __version__ = "0.4"
def resolve_binary_path(option, opt_str, value, parser):
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():
- 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 " \
"described using an easy python syntax, and several can be " \
"ran at once."
@@ -65,9 +52,6 @@ def create_parser():
callback = resolve_binary_path, type = "string",
dest = "bin", default = "pacman",
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",
dest = "keeproot", default = False,
help = "don't remove the generated pacman root filesystem")
@@ -110,6 +94,9 @@ if __name__ == "__main__":
env.pacman["scriptlet-shell"] = opts.scriptletshell
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:
tap.bail("no tests defined, nothing to do")
os.rmdir(root_path)