removed more unnecessary tests and added test for file-list file, currently failing

Author: yucongalicechen

src/diffpy/labpdfproc/labpdfprocapp.py

@@ -29,8 +29,8 @@ def get_args(override_cli_inputs=None):
         "everything in the folder ./data), 'data/file_list.txt' (load"
         " the list of files contained in the text-file called "
         "file_list.txt that can be found in the folder ./data), "
-        "'data/*.chi' (load all files with extension .chi in the "
-        "folder ./data), 'data*' (load all files and directories starting with 'data').",
+        "'./*.chi', 'data/*.chi' (load all files with extension .chi in the "
+        "folder ./data).",
     )
     p.add_argument(
         "-a",

src/diffpy/labpdfproc/tests/test_tools.py

@@ -65,20 +65,8 @@
         ["good_data*"],
         ["good_data.chi", "good_data.xy", "good_data.txt"],
     ),
-    (  # wildcard pattern, matching files or directories starting with input
-        ["input*"],
-        [
-            "input_dir/good_data.chi",
-            "input_dir/good_data.xy",
-            "input_dir/good_data.txt",
-            "input_dir/unreadable_file.txt",
-            "input_dir/binary.pkl",
-        ],
-    ),
-    (  # wildcard pattern, matching files or directories starting with unreadable and ending with .txt extension
-        ["unreadable*.txt"],
-        ["unreadable_file.txt"],
-    ),
+    # wildcard pattern for file-list file, currently failing
+    # (["input_dir/file_list*"], "file_list.txt"),
 ]
 
 

src/diffpy/labpdfproc/tools.py

@@ -44,12 +44,10 @@ def _expand_user_input(args):
     """
     wildcard_inputs = [input_name for input_name in args.input if "*" in input_name]
     file_list_inputs = [input_name for input_name in args.input if "file_list" in input_name]
-
     for wildcard_input in wildcard_inputs:
         input_files = [str(file) for file in Path(".").glob(wildcard_input)]
         args.input.extend(input_files)
         args.input.remove(wildcard_input)
-
     for file_list_input in file_list_inputs:
         with open(file_list_input, "r") as f:
             file_inputs = [input_name.strip() for input_name in f.readlines()]