Skip to content

Commit bfa3d8e

Browse files
edited wildcard in file-list file
1 parent 2fe6286 commit bfa3d8e

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/diffpy/labpdfproc/tests/conftest.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ def user_filesystem(tmp_path):
3636
with open(input_dir / "binary.pkl", "wb") as f:
3737
f.write(binary_data)
3838

39-
with open(base_dir / "file_list.txt", "w") as f:
40-
f.write("./*.txt")
4139
with open(input_dir / "file_list.txt", "w") as f:
4240
f.write("good_data.chi \n good_data.xy \n good_data.txt \n missing_file.txt")
4341
with open(input_dir / "file_list_example2.txt", "w") as f:
42+
f.write("input_dir/*.txt \n")
4443
f.write("input_dir/good_data.chi \n")
4544
f.write("good_data.xy \n")
4645
f.write(f"{str(input_dir.resolve() / 'good_data.txt')}\n")

src/diffpy/labpdfproc/tests/test_tools.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
"input_dir/binary.pkl",
5050
],
5151
),
52-
( # file_list_example2.txt list of files provided in different directories
52+
( # file_list_example2.txt list of files provided in different directories with wildcard
5353
["input_dir/file_list_example2.txt"],
54-
["input_dir/good_data.chi", "good_data.xy", "input_dir/good_data.txt"],
54+
["input_dir/good_data.chi", "good_data.xy", "input_dir/good_data.txt", "input_dir/unreadable_file.txt"],
5555
),
5656
( # wildcard pattern, matching files with .chi extension in the same directory
5757
["./*.chi"],
@@ -65,8 +65,6 @@
6565
["good_data*"],
6666
["good_data.chi", "good_data.xy", "good_data.txt"],
6767
),
68-
# wildcard pattern in a file-list file
69-
(["file_list.txt"], ["good_data.txt", "unreadable_file.txt"]),
7068
]
7169

7270

0 commit comments

Comments
 (0)