borgbackup/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-10-12 02:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: use os.linesep in the repo-info default assertions

Browse Source 
On Windows, repo-info output lines end with CRLF, so the assertions
expecting a trailing "\n" failed there.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
Thomas Waldmann
2026-09-27 17:05:24 +02:00
co-authored by Claude Opus 5.5
parent bce686de68
commit e893f13ed1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/borg/testsuite/archiver/repo_create_cmd_test.py
+4 -4
View File
@@ -219,7 +219,7 @@ def test_repo_create_default_compression(archivers, request, monkeypatch):
archiver = request.getfixturevalue(archivers)
create_regular_file(archiver.input_path, "file1", size=1024 * 80)
cmd(archiver, "repo-create", RK_ENCRYPTION, "--compression=zstd,5")
assert "Default compression: zstd,5\n" in cmd(archiver, "repo-info")
assert "Default compression: zstd,5" + os.linesep in cmd(archiver, "repo-info")
assert json.loads(cmd(archiver, "repo-info", "--json"))["defaults"]["compression"] == "zstd,5"
# without --compression, create uses the repository default.
cmd(archiver, "create", "test", "input")
@@ -242,8 +242,8 @@ def test_repo_create_without_default_compression(archivers, request):
with open_repository(archiver) as repository:
assert repository.load_defaults() == {}
output = cmd(archiver, "repo-info")
assert "Default compression: lz4 (built-in)\n" in output
assert "Default chunker params: %s,%d,%d,%d,%d (built-in)\n" % CHUNKER_PARAMS in output
assert "Default compression: lz4 (built-in)" + os.linesep in output
assert "Default chunker params: %s,%d,%d,%d,%d (built-in)" % CHUNKER_PARAMS + os.linesep in output
assert json.loads(cmd(archiver, "repo-info", "--json"))["defaults"] == {
"compression": "lz4",
"chunker_params": "%s,%d,%d,%d,%d" % CHUNKER_PARAMS,
@@ -295,7 +295,7 @@ def test_repo_create_default_chunker_params(archivers, request, monkeypatch):
archiver = request.getfixturevalue(archivers)
create_regular_file(archiver.input_path, "file1", size=1024 * 80)
cmd(archiver, "repo-create", RK_ENCRYPTION, "--chunker-params=fixed,4096")
assert "Default chunker params: fixed,4096,0\n" in cmd(archiver, "repo-info")
assert "Default chunker params: fixed,4096,0" + os.linesep in cmd(archiver, "repo-info")
assert json.loads(cmd(archiver, "repo-info", "--json"))["defaults"]["chunker_params"] == "fixed,4096,0"
# without --chunker-params (or with "default"), create uses the repository default.
cmd(archiver, "create", "test1", "input")