Merge pull request #9291 from MultisampledNight/backport/fix-padme-ui-to-1.4-maint

Backport "Fix padme UI" to 1.4-maint

src/borg/compress.pyx

@@ -600,8 +600,8 @@ class CompressionSpec:
         elif self.name == 'obfuscate':
             if 3 <= count <= 5:
                 level = int(values[1])
-                if not ((1 <= level <= 6) or (110 <= level <= 123)):
-                    raise ArgumentTypeError("level must be >= 1 and <= 6 or >= 110 and <= 123")
+                if not ((1 <= level <= 6) or (110 <= level <= 123) or (level == 250)):
+                    raise ArgumentTypeError("level must be (inclusively) within 1...6, 110...123 or equal to 250")
                 self.level = level
                 compression = ','.join(values[2:])
             else:

src/borg/testsuite/compress.py

@@ -215,7 +215,7 @@ def test_obfuscate():
     ],
 )
 def test_padme_obfuscation(data_length, expected_padding):
-    compressor = Compressor(name="obfuscate", level=250, compressor=Compressor("none"))
+    compressor = CompressionSpec("obfuscate,250,none").compressor
     # The inner compressor will add an inner header of 2 bytes, so we reduce the data length by 2 bytes
     # to be able to use (almost) the same test cases as in the master branch.
     data = b"x" * (data_length - 2)