Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 1 commit into from
Sep 27, 2026
+4 −4
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/borg/testsuite/archiver/repo_create_cmd_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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,
Expand Down Expand Up @@ -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")
Expand Down
Loading