arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

Fix Directories regex test

Browse Source 
The entire path to the file would match unless another path separator is added.
This commit is contained in:
glubsy 2021-08-06 17:18:23 +02:00
parent 0db66baace
commit 3dccb686e2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/directories_test.py
View File

@ -474,14 +474,17 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
assert "file_which_shouldnt_match" in files assert "file_which_shouldnt_match" in files
# This should match the directory only # This should match the directory only
regex6 = r".*/subdir.*" regex6 = r".*/.*subdir.*/.*"
if ISWINDOWS: if ISWINDOWS:
regex6 = r".*\\.*subdir.*" regex6 = r".*\\.*subdir.*\\.*"
assert os.sep in regex6
self.d._exclude_list.rename(regex5, regex6) self.d._exclude_list.rename(regex5, regex6)
self.d._exclude_list.remove(regex1) self.d._exclude_list.remove(regex1)
eq_(len(self.d._exclude_list.compiled), 1)
assert regex1 not in self.d._exclude_list assert regex1 not in self.d._exclude_list
assert regex5 not in self.d._exclude_list assert regex5 not in self.d._exclude_list
assert self.d._exclude_list.error(regex6) is None assert self.d._exclude_list.error(regex6) is None
assert regex6 in self.d._exclude_list
# This still should not be affected # This still should not be affected
eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.Normal) eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.Normal)
files = self.get_files_and_expect_num_result(5) files = self.get_files_and_expect_num_result(5)
@ -490,6 +493,8 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
assert "unwanted_subdirfile.gif" not in files assert "unwanted_subdirfile.gif" not in files
# This file under "subdar" directory should not be filtered out # This file under "subdar" directory should not be filtered out
assert "file_ending_with_subdir" in files assert "file_ending_with_subdir" in files
# This file is in a directory that should be filtered out
assert "file_which_shouldnt_match" not in files
def test_japanese_unicode(self, tmpdir): def test_japanese_unicode(self, tmpdir):
p1 = Path(str(tmpdir)) p1 = Path(str(tmpdir))