Test python binding for package_PackagesBlob

Signed-off-by: Arvid Requate <requate@univention.de>

diff --git a/python/samba/tests/password_hash_fl2003.py b/python/samba/tests/password_hash_fl2003.py
index ab99b3b1823e01d49ba25aab7892a1fbde744617..86592ddbac9f92350adb34333659d057a4b5357c 100644 (file)
--- a/python/samba/tests/password_hash_fl2003.py
+++ b/python/samba/tests/password_hash_fl2003.py
@@ -69,6 +69,13 @@ 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 917e973cdbcd8d14f82d3f7a00096949a481b3c2..90b9fd7372d137de1e24ddab66fe85a7cce640ca 100644 (file)
--- a/python/samba/tests/password_hash_fl2008.py
+++ b/python/samba/tests/password_hash_fl2008.py
@@ -71,6 +71,13 @@ 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 fa7b9b74cd3c399b499f75fe6fe29814cca9450c..6f27821a8e5c1830c4ac760f7c83a3854bd9814b 100644 (file)
--- 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,11 +81,18 @@ 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()