improve tests

- remove redundant tests
- improve comments / name
- improve comparison to use less-than

Author: ThomasWaldmann

src/borg/testsuite/archiver.py

@@ -1617,43 +1617,12 @@ def test_info(self):
         info_archive = self.cmd('info', '--first', '1', self.repository_location)
         assert 'Archive name: test\n' in info_archive
 
-    def test_info_matches_create_deduplicated_size(self):
-        # Create two identical files to ensure intra-archive deduplication happens,
-        # so the deduplicated size is visibly different from compressed size.
-        data = b'X' * (1024 * 80)
-        self.create_regular_file('file1', contents=data)
-        self.create_regular_file('file2', contents=data)
-        self.cmd('init', '--encryption=repokey', self.repository_location)
-        create_json = json.loads(self.cmd('create', '--json', self.repository_location + '::test', 'input'))
-        info_json = json.loads(self.cmd('info', '--json', self.repository_location + '::test'))
-
-        # Compare deduplicated size of "This archive" between create and info.
-        dedup_create = create_json['archive']['stats']['deduplicated_size']
-        assert len(info_json['archives']) == 1
-        dedup_info = info_json['archives'][0]['stats']['deduplicated_size']
-        assert dedup_create == dedup_info
-
-    def test_info_matches_create_all_archives_deduplicated_size(self):
-        # Verify that the "All archives" deduplicated size reported by `borg create --json`
-        # matches the one reported by `borg info --json <repo>`.
-        data = b'Y' * (1024 * 80)
-        self.create_regular_file('file1', contents=data)
-        self.create_regular_file('file2', contents=data)
-        self.cmd('init', '--encryption=repokey', self.repository_location)
-        # Create two archives so that the "All archives" section is meaningful and stable.
-        self.cmd('create', '--json', self.repository_location + '::a1', 'input')
-        create_json2 = json.loads(self.cmd('create', '--json', self.repository_location + '::a2', 'input'))
-        info_repo_json = json.loads(self.cmd('info', '--json', self.repository_location))
-
-        # In JSON, the repository-wide deduplicated size corresponds to cache.stats.unique_size.
-        dedup_create_all = create_json2['cache']['stats']['unique_size']
-        dedup_info_all = info_repo_json['cache']['stats']['unique_size']
-        assert dedup_create_all == dedup_info_all
-
-    def test_single_archive_all_equals_this_info_and_create(self):
-        # With a single archive in the repository, the deduplicated size for
-        # "This archive" and "All archives" should be identical, both in
-        # `borg create --json` and in `borg info --json` (repo and archive views).
+    def test_info_and_create_stats(self):
+        # "This archive" deduplicated size should match between `borg info` and `borg create --stats`.
+        # "All archives" deduplicated size should match between `borg info` and `borg create --stats`.
+        # However, even if there is only one archive in the repo, the deduplicated-size stats for
+        # "All archives" do not match those for "This archive" because metadata is accounted for at the
+        # repository level ("All archives"), but not for an individual archive ("This archive").
         data = b'Z' * (1024 * 80)
         self.create_regular_file('file1', contents=data)
         self.create_regular_file('file2', contents=data)
@@ -1676,8 +1645,8 @@ def test_single_archive_all_equals_this_info_and_create(self):
         assert dedup_all_create == dedup_all_info
         # accounting for "all archives" includes metadata chunks, for "this archive" it does not,
         # thus a mismatch is expected.
-        assert dedup_this_create != dedup_all_create
-        assert dedup_this_info != dedup_all_info
+        assert dedup_this_create < dedup_all_create
+        assert dedup_this_info < dedup_all_info
 
     def test_info_json(self):
         self.create_regular_file('file1', size=1024 * 80)