From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 2 Mar 2023 22:39:55 +0000 (+1300)
Subject: tests/krb5: Unconditionally check compressed claims
X-Git-Tag: talloc-2.4.1~1476
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c333037cd25687237b7cb0024f31ebaeae5e5cd;p=thirdparty%2Fsamba.git

tests/krb5: Unconditionally check compressed claims

not only if STRICT_CHECKING=1.

This also fixes a bug where the call to huffman_decompress() was
indented incorrectly.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index c3af7d955d1..ead7d98f1a3 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -3571,19 +3571,18 @@ class RawKerberosTest(TestCaseInTempDir):
                 uncompressed_size = client_claims.uncompressed_claims_set_size
                 compression_format = client_claims.compression_format
 
-                if self.strict_checking:
-                    if uncompressed_size < 384:
-                        self.assertEqual(claims.CLAIMS_COMPRESSION_FORMAT_NONE,
-                                         compression_format,
-                                         f'{claims_type} unexpectedly '
-                                         f'compressed ({uncompressed_size} '
-                                         f'bytes uncompressed)')
-                    else:
-                        self.assertEqual(
-                            claims.CLAIMS_COMPRESSION_FORMAT_XPRESS_HUFF,
-                            compression_format,
-                            f'{claims_type} unexpectedly not compressed '
-                            f'({uncompressed_size} bytes uncompressed)')
+                if uncompressed_size < 384:
+                    self.assertEqual(claims.CLAIMS_COMPRESSION_FORMAT_NONE,
+                                     compression_format,
+                                     f'{claims_type} unexpectedly '
+                                     f'compressed ({uncompressed_size} '
+                                     f'bytes uncompressed)')
+                else:
+                    self.assertEqual(
+                        claims.CLAIMS_COMPRESSION_FORMAT_XPRESS_HUFF,
+                        compression_format,
+                        f'{claims_type} unexpectedly not compressed '
+                        f'({uncompressed_size} bytes uncompressed)')
 
                     claims_data = huffman_decompress(claims_data,
                                                      uncompressed_size)