mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace use of “exclude_path” in tests 

The newly added pattern matcher class can replace the “exclude_path”
function. The latter is going to be removed in a later change.
This commit is contained in:
Michael Hanselmann 2016-01-18 15:11:28 +01:00
parent 9747755131
commit 190107ada7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
borg/testsuite/helpers.py
View File

@ -9,7 +9,7 @@ import sys
import msgpack
import msgpack.fallback
from ..helpers import exclude_path, Location, format_file_size, format_timedelta, PathPrefixPattern, FnmatchPattern, make_path_safe, \
from ..helpers import Location, format_file_size, format_timedelta, PathPrefixPattern, FnmatchPattern, make_path_safe, \
prune_within, prune_split, get_cache_dir, Statistics, is_slow_msgpack, yes, RegexPattern, \
StableDict, int_to_bigint, bigint_to_int, parse_timestamp, CompressionSpec, ChunkerParams, \
ProgressIndicatorPercent, ProgressIndicatorEndless, load_excludes, parse_pattern, PatternMatcher
@ -334,8 +334,9 @@ def test_patterns_from_file(tmpdir, lines, expected):
]
def evaluate(filename):
patterns = load_excludes(open(filename, "rt"))
return [path for path in files if not exclude_path(path, patterns)]
matcher = PatternMatcher(fallback=True)
matcher.add(load_excludes(open(filename, "rt")), False)
return [path for path in files if matcher.match(path)]
exclfile = tmpdir.join("exclude.txt")