From 00fbdabc55c1de28f65eef27cb6448608c3d4e1f Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sun, 6 Apr 2014 19:20:55 -0400 Subject: pactest: treat arguments as files instead of globs glob() returns an empty list if input does not match any files, causing non-existent test files to be silently skipped. Treating arguments as files causes pactest to immediately bail out with an appropriate error message on non-existent files. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/pactest.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index d80076e2..0e06f17d 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import glob from optparse import OptionParser import os import shutil @@ -100,16 +99,18 @@ 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: + if args is None or len(args) == 0: tap.bail("no tests defined, nothing to do") os.rmdir(root_path) sys.exit(2) - for i in opts.testcases: - env.addtest(i) + try: + for i in args: + env.addtest(i) + except Exception as e: + tap.bail(e) + os.rmdir(root_path) + sys.exit(2) # run tests env.run() -- cgit v1.2.3-24-g4f1b