From f7673e3f066e8b8330084e079942d63cdbbbfb1a Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Thu, 15 Aug 2024 22:26:03 -0400 Subject: [PATCH] Add test to make sure 0-added,0-removed modified changes aren't in JSON output. --- src/borg/testsuite/archiver.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py index 33d72819eb..643b79ae94 100644 --- a/src/borg/testsuite/archiver.py +++ b/src/borg/testsuite/archiver.py @@ -23,6 +23,7 @@ from hashlib import sha256 from io import BytesIO, StringIO from unittest.mock import patch +from pathlib import Path import pytest @@ -4472,6 +4473,7 @@ def test_basic_functionality(self): self.create_regular_file('file_removed', size=256) self.create_regular_file('file_removed2', size=512) self.create_regular_file('file_replaced', size=1024) + self.create_regular_file('file_touched', size=128) os.mkdir('input/dir_replaced_with_file') os.chmod('input/dir_replaced_with_file', stat.S_IFDIR | 0o755) os.mkdir('input/dir_removed') @@ -4500,6 +4502,7 @@ def test_basic_functionality(self): self.create_regular_file('file_replaced', contents=b'0' * 4096) os.unlink('input/file_removed') os.unlink('input/file_removed2') + Path('input/file_touched').touch() os.rmdir('input/dir_replaced_with_file') self.create_regular_file('dir_replaced_with_file', size=8192) os.chmod('input/dir_replaced_with_file', stat.S_IFREG | 0o755) @@ -4562,6 +4565,13 @@ def do_asserts(output, can_compare_ids, content_only=False): change = '0 B' if can_compare_ids else '{:<19}'.format('modified') self.assert_line_exists(lines, f"{change}.*input/empty") + # Show a 0 byte change for a file whose contents weren't modified + # for text output. + if content_only: + assert "input/file_touched" not in output + else: + self.assert_line_exists(lines, f"{change}.*input/file_touched") + if are_hardlinks_supported(): self.assert_line_exists(lines, f"{change}.*input/hardlink_contents_changed") if are_symlinks_supported(): @@ -4610,6 +4620,16 @@ def get_changes(filename, data): # File unchanged assert not any(get_changes('input/file_unchanged', joutput)) + # Do NOT show a 0 byte change for a file whose contents weren't + # modified for JSON output. + unexpected = {'type': 'modified', 'added': 0, 'removed': 0} + assert unexpected not in get_changes('input/file_touched', joutput) + if not content_only: + assert {"ctime", "mtime"}.issubset({c["type"] for c in get_changes('input/file_touched', joutput)}) + else: + # And if we're doing content-only, don't show the file at all. + assert not any(get_changes('input/file_touched', joutput)) + # Directory replaced with a regular file if 'BORG_TESTS_IGNORE_MODES' not in os.environ and not content_only: assert {'type': 'mode', 'old_mode': 'drwxr-xr-x', 'new_mode': '-rwxr-xr-x'} in \