sq Test python binding for package_PackagesBlob

diff --git a/python/samba/tests/password_hash_fl2003.py b/python/samba/tests/password_hash_fl2003.py
index 86592ddbac9f92350adb34333659d057a4b5357c..d8326be8177931da586578cf783a1c8655e1d942 100644 (file)
--- a/python/samba/tests/password_hash_fl2003.py
+++ b/python/samba/tests/password_hash_fl2003.py
@@ -59,6 +59,13 @@ class PassWordHashFl2003Tests(PassWordHashTests):
         self.assertEquals(2, pos)
         self.assertEquals("Packages", package.name)
 
+        # 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)
+
         (pos, package) = get_package(sc, "Primary:WDigest")
         self.assertEquals(3, pos)
         self.assertEquals("Primary:WDigest", package.name)
@@ -69,12 +76,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",

diff --git a/python/samba/tests/password_hash_fl2008.py b/python/samba/tests/password_hash_fl2008.py
index 90b9fd7372d137de1e24ddab66fe85a7cce640ca..d193726a1b86c2e0a7526e784633411ddfbf3241 100644 (file)
--- a/python/samba/tests/password_hash_fl2008.py
+++ b/python/samba/tests/password_hash_fl2008.py
@@ -61,6 +61,13 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         self.assertEquals(3, pos)
         self.assertEquals("Packages", package.name)
 
+        # 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)
+
         (pos, package) = get_package(sc, "Primary:WDigest")
         self.assertEquals(4, pos)
         self.assertEquals("Primary:WDigest", package.name)
@@ -71,13 +78,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 6f27821a8e5c1830c4ac760f7c83a3854bd9814b..518b8ba3552753e4c1088c99001fed50f51804d5 100644 (file)
--- a/python/samba/tests/password_hash_gpgme.py
+++ b/python/samba/tests/password_hash_gpgme.py
@@ -71,6 +71,13 @@ class PassWordHashGpgmeTests(PassWordHashTests):
         self.assertEquals(4, pos)
         self.assertEquals("Packages", package.name)
 
+        # 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)
+
         (pos, package) = get_package(sc, "Primary:SambaGPG")
         self.assertEquals(5, pos)
         self.assertEquals("Primary:SambaGPG", package.name)
@@ -81,12 +88,6 @@ 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)