suite: parse filter args into lists sooner

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/suite/__init__.py b/teuthology/suite/__init__.py
index 9bd0a09737b70d6a4de886f1cfd5066329f46ef4..d3be09a18508b4fa601b4d6012a28ee8e9f90769 100644 (file)
--- a/teuthology/suite/__init__.py
+++ b/teuthology/suite/__init__.py
@@ -40,6 +40,8 @@ def process_args(args):
         elif key == 'subset' and value is not None:
             # take input string '2/3' and turn into (2, 3)
             value = tuple(map(int, value.split('/')))
+        elif key in ('filter_in', 'filter_out'):
+            value = [x.strip() for x in value.split(',')]
         conf[key] = value
     return conf
 

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index 6320c5bd15229bb8a97dc92fe8a931890f71bd52..0763cab71213267b910236a142171e45dd41ed88 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -293,10 +293,9 @@ class Run(object):
             # separated components to be used in searches.
             filter_in = self.args.filter_in
             if filter_in:
-                filter_list = [x.strip() for x in filter_in.split(',')]
-                if not any([x in description for x in filter_list]):
+                if not any([x in description for x in filter_in]):
                     all_filt = []
-                    for filt_samp in filter_list:
+                    for filt_samp in filter_in:
                         all_filt.extend(
                             [x.find(filt_samp) < 0 for x in base_frag_paths]
                         )
@@ -304,11 +303,10 @@ class Run(object):
                         continue
             filter_out = self.args.filter_out
             if filter_out:
-                filter_list = [x.strip() for x in filter_out.split(',')]
-                if any([x in description for x in filter_list]):
+                if any([x in description for x in filter_out]):
                     continue
                 all_filt_val = False
-                for filt_samp in filter_list:
+                for filt_samp in filter_out:
                     flist = [filt_samp in x for x in base_frag_paths]
                     if any(flist):
                         all_filt_val = True