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 <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files 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 <http://www.gnu.org/licenses/>.
 
-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()