From eff273d09ace73675dc73010f98525f951121b94 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 26 Jun 2017 14:54:12 +0200 Subject: [PATCH] Revert "Test python binding for package_PackagesBlob" This reverts commit cfc69410bbf4598fd18e1e1bce262e8a247df926. --- python/samba/tests/password_hash_fl2003.py | 7 ------- python/samba/tests/password_hash_fl2008.py | 7 ------- python/samba/tests/password_hash_gpgme.py | 11 ++--------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/python/samba/tests/password_hash_fl2003.py b/python/samba/tests/password_hash_fl2003.py index 86592ddbac9f..ab99b3b1823e 100644 --- a/python/samba/tests/password_hash_fl2003.py +++ b/python/samba/tests/password_hash_fl2003.py @@ -69,13 +69,6 @@ class PassWordHashFl2003Tests(PassWordHashTests): binascii.a2b_hex(package.data)) self.check_wdigests(digests) - # Check that the Package names are correct. - # - pb = ndr_unpack(drsblobs.package_PackagesBlob, - binascii.a2b_hex(package.data)) - expected = ["Kerberos", "WDigest"] - self.assertEquals(expected, pb.names) - def test_userPassword_sha256(self): self.add_user(options=[("password hash userPassword schemes", "CryptSHA256")]) diff --git a/python/samba/tests/password_hash_fl2008.py b/python/samba/tests/password_hash_fl2008.py index 90b9fd7372d1..917e973cdbcd 100644 --- a/python/samba/tests/password_hash_fl2008.py +++ b/python/samba/tests/password_hash_fl2008.py @@ -71,13 +71,6 @@ class PassWordHashFl2008Tests(PassWordHashTests): binascii.a2b_hex(package.data)) self.check_wdigests(digests) - # Check that the Package names are correct. - # - pb = ndr_unpack(drsblobs.package_PackagesBlob, - binascii.a2b_hex(package.data)) - expected = ["Kerberos-Newer-Keys", "Kerberos", "WDigest"] - self.assertEquals(expected, pb.names) - def test_userPassword_sha512(self): self.add_user(options=[("password hash userPassword schemes", "CryptSHA512")]) diff --git a/python/samba/tests/password_hash_gpgme.py b/python/samba/tests/password_hash_gpgme.py index 6f27821a8e5c..fa7b9b74cd3c 100644 --- a/python/samba/tests/password_hash_gpgme.py +++ b/python/samba/tests/password_hash_gpgme.py @@ -47,7 +47,7 @@ class PassWordHashGpgmeTests(PassWordHashTests): self.add_user() if not self.lp.get("password hash gpg key ids"): self.skipTest("No password hash gpg key ids, " + - "Primary:SambaGPG will not be generated") + "Primary:SambaGPG will not be generated"); sc = self.get_supplemental_creds() @@ -81,18 +81,11 @@ class PassWordHashGpgmeTests(PassWordHashTests): binascii.a2b_hex(wd_package.data)) self.check_wdigests(digests) - # Check that the Package names are correct. - # - pb = ndr_unpack(drsblobs.package_PackagesBlob, - binascii.a2b_hex(package.data)) - expected = ["Kerberos-Newer-Keys", "Kerberos", "WDigest", "SambaGPG"] - self.assertEquals(expected, pb.names) - def test_supplementalCredentials_cleartext(self): self.add_user(clear_text=True) if not self.lp.get("password hash gpg key ids"): self.skipTest("No password hash gpg key ids, " + - "Primary:SambaGPG will not be generated") + "Primary:SambaGPG will not be generated"); sc = self.get_supplemental_creds() -- 2.34.1