From 947ec0ef34cc28fa06742c09bfbb4ff2cf233f66 Mon Sep 17 00:00:00 2001 From: swryan Date: Thu, 7 Mar 2024 17:12:05 -0500 Subject: [PATCH] fix handling of --skip_dirs arg --- testflo/main.py | 3 +-- testflo/util.py | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/testflo/main.py b/testflo/main.py index 037045d..79bdf8d 100644 --- a/testflo/main.py +++ b/testflo/main.py @@ -120,8 +120,6 @@ def main(args=None): nprocs = options.num_procs - options.skip_dirs = [] - # read user prefs from ~/.testflo file. # create one if it doesn't exist homedir = os.path.expanduser('~') @@ -131,6 +129,7 @@ def main(args=None): f.write("""[testflo] skip_dirs=site-packages, dist-packages, + __pycache__, build, _build, contrib diff --git a/testflo/util.py b/testflo/util.py index fb82393..c0323e7 100644 --- a/testflo/util.py +++ b/testflo/util.py @@ -446,7 +446,9 @@ def read_config_file(cfgfile, options): typ = lambda x: x if isinstance(action, _AppendAction): - setattr(options, name, [typ(s.strip()) for s in optstr.split(',') if s.strip()]) + oldval = getattr(options, name) + addval = [typ(s.strip()) for s in optstr.split(',') if s.strip()] + setattr(options, name, oldval+addval) else: setattr(options, name, typ(optstr))