From 73c196aa70d49505809b50750cfa1152ea963aab Mon Sep 17 00:00:00 2001 From: Pavel Andreev Date: Thu, 23 Jan 2025 19:49:10 +0000 Subject: [PATCH] Fix according to review comments --- borgmatic/actions/create.py | 4 ++-- tests/unit/actions/test_create.py | 24 +++++++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/borgmatic/actions/create.py b/borgmatic/actions/create.py index bbf042d1..ffbecd2e 100644 --- a/borgmatic/actions/create.py +++ b/borgmatic/actions/create.py @@ -55,7 +55,7 @@ def collect_patterns(config): for source_directory in config.get('source_directories', ()) ) + tuple( - parse_pattern(pattern_line.strip()) + parse_pattern(pattern_line.strip(), borgmatic.borg.pattern.Pattern_style.SHELL) for pattern_line in config.get('patterns', ()) if not pattern_line.lstrip().startswith('#') if pattern_line.strip() @@ -66,7 +66,7 @@ def collect_patterns(config): for exclude_line in config.get('exclude_patterns', ()) ) + tuple( - parse_pattern(pattern_line.strip()) + parse_pattern(pattern_line.strip(), borgmatic.borg.pattern.Pattern_style.SHELL) for filename in config.get('patterns_from', ()) for pattern_line in open(filename).readlines() if not pattern_line.lstrip().startswith('#') diff --git a/tests/unit/actions/test_create.py b/tests/unit/actions/test_create.py index cda86e95..e8322876 100644 --- a/tests/unit/actions/test_create.py +++ b/tests/unit/actions/test_create.py @@ -34,11 +34,13 @@ def test_collect_patterns_converts_source_directories(): def test_collect_patterns_parses_config_patterns(): - flexmock(module).should_receive('parse_pattern').with_args('R /foo').and_return(Pattern('/foo')) + flexmock(module).should_receive('parse_pattern').with_args( + 'R /foo', Pattern_style.SHELL).and_return(Pattern('/foo')) flexmock(module).should_receive('parse_pattern').with_args('# comment').never() flexmock(module).should_receive('parse_pattern').with_args('').never() flexmock(module).should_receive('parse_pattern').with_args(' ').never() - flexmock(module).should_receive('parse_pattern').with_args('R /bar').and_return(Pattern('/bar')) + flexmock(module).should_receive('parse_pattern').with_args( + 'R /bar', Pattern_style.SHELL).and_return(Pattern('/bar')) assert module.collect_patterns({'patterns': ['R /foo', '# comment', '', ' ', 'R /bar']}) == ( Pattern('/foo'), @@ -60,12 +62,15 @@ def test_collect_patterns_reads_config_patterns_from_file(): builtins.should_receive('open').with_args('file2.txt').and_return( io.StringIO('R /bar\n# comment\n\n \nR /baz') ) - flexmock(module).should_receive('parse_pattern').with_args('R /foo').and_return(Pattern('/foo')) + flexmock(module).should_receive('parse_pattern').with_args( + 'R /foo', Pattern_style.SHELL).and_return(Pattern('/foo')) flexmock(module).should_receive('parse_pattern').with_args('# comment').never() flexmock(module).should_receive('parse_pattern').with_args('').never() flexmock(module).should_receive('parse_pattern').with_args(' ').never() - flexmock(module).should_receive('parse_pattern').with_args('R /bar').and_return(Pattern('/bar')) - flexmock(module).should_receive('parse_pattern').with_args('R /baz').and_return(Pattern('/baz')) + flexmock(module).should_receive('parse_pattern').with_args( + 'R /bar', Pattern_style.SHELL).and_return(Pattern('/bar')) + flexmock(module).should_receive('parse_pattern').with_args( + 'R /baz', Pattern_style.SHELL).and_return(Pattern('/baz')) assert module.collect_patterns({'patterns_from': ['file1.txt', 'file2.txt']}) == ( Pattern('/foo'), @@ -89,6 +94,15 @@ def test_collect_patterns_reads_config_exclude_from_file(): builtins.should_receive('open').with_args('file2.txt').and_return( io.StringIO('/bar\n# comment\n\n \n/baz') ) + flexmock(module).should_receive('parse_pattern').with_args( + '- /foo', default_style=Pattern_style.FNMATCH).and_return(Pattern('/foo', Pattern_type.EXCLUDE, Pattern_style.FNMATCH)) + flexmock(module).should_receive('parse_pattern').with_args( + '- /bar', default_style=Pattern_style.FNMATCH).and_return(Pattern('/bar', Pattern_type.EXCLUDE, Pattern_style.FNMATCH)) + flexmock(module).should_receive('parse_pattern').with_args('# comment').never() + flexmock(module).should_receive('parse_pattern').with_args('').never() + flexmock(module).should_receive('parse_pattern').with_args(' ').never() + flexmock(module).should_receive('parse_pattern').with_args( + '- /baz', default_style=Pattern_style.FNMATCH).and_return(Pattern('/baz', Pattern_type.EXCLUDE, Pattern_style.FNMATCH)) assert module.collect_patterns({'exclude_from': ['file1.txt', 'file2.txt']}) == ( Pattern('/foo', Pattern_type.EXCLUDE, Pattern_style.FNMATCH),