dsdb/tests: remove duplicate test_smartcard_required3() from sam.py

The function was 100% the same...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 57151ca62d0abd130443e1e168c4a0f452c78412..f57454b7725fe5de6ba513c3640eb1a7659275d6 100755 (executable)
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -2642,107 +2642,6 @@ class SamTests(samba.tests.TestCase):
 
         delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
 
-    def test_smartcard_required3(self):
-        """Test the UF_SMARTCARD_REQUIRED behaviour"""
-        print "Testing UF_SMARTCARD_REQUIRED behaviour\n"
-
-        delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
-
-        ldb.add({
-            "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-            "objectclass": "user",
-            "userAccountControl": str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED|UF_ACCOUNTDISABLE),
-            })
-
-        res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
-                         scope=SCOPE_BASE,
-                         attrs=["sAMAccountType", "userAccountControl",
-                                "pwdLastSet", "msDS-KeyVersionNumber",
-                                "replPropertyMetaData"])
-        self.assertTrue(len(res) == 1)
-        self.assertEqual(int(res[0]["sAMAccountType"][0]),
-                         ATYPE_NORMAL_ACCOUNT)
-        self.assertEqual(int(res[0]["userAccountControl"][0]),
-                         UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED|UF_ACCOUNTDISABLE)
-        self.assertEqual(int(res[0]["pwdLastSet"][0]), 0)
-        self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 1)
-        self.assertTrue(len(res[0]["replPropertyMetaData"]) == 1)
-        rpmd = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                          res[0]["replPropertyMetaData"][0])
-        lastsetmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_pwdLastSet)
-        self.assertIsNotNone(lastsetmd)
-        self.assertEqual(lastsetmd.version, 1)
-        nthashmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_unicodePwd)
-        self.assertIsNotNone(nthashmd)
-        self.assertEqual(nthashmd.version, 1)
-        nthistmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_ntPwdHistory)
-        self.assertIsNotNone(nthistmd)
-        self.assertEqual(nthistmd.version, 1)
-        lmhashmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_dBCSPwd)
-        self.assertIsNotNone(lmhashmd)
-        self.assertEqual(lmhashmd.version, 1)
-        lmhistmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_lmPwdHistory)
-        self.assertIsNotNone(lmhistmd)
-        self.assertEqual(lmhistmd.version, 1)
-        spcbmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_supplementalCredentials)
-        self.assertIsNotNone(spcbmd)
-        self.assertEqual(spcbmd.version, 1)
-
-        m = Message()
-        m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
-        m["userAccountControl"] = MessageElement(
-          str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
-        ldb.modify(m)
-
-        res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
-                         scope=SCOPE_BASE,
-                         attrs=["sAMAccountType", "userAccountControl",
-                                "pwdLastSet", "msDS-KeyVersionNumber",
-                                "replPropertyMetaData"])
-        self.assertTrue(len(res) == 1)
-        self.assertEqual(int(res[0]["sAMAccountType"][0]),
-                         ATYPE_NORMAL_ACCOUNT)
-        self.assertEqual(int(res[0]["userAccountControl"][0]),
-                         UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED)
-        self.assertEqual(int(res[0]["pwdLastSet"][0]), 0)
-        self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 1)
-        self.assertTrue(len(res[0]["replPropertyMetaData"]) == 1)
-        rpmd = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
-                          res[0]["replPropertyMetaData"][0])
-        lastsetmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_pwdLastSet)
-        self.assertIsNotNone(lastsetmd)
-        self.assertEqual(lastsetmd.version, 1)
-        nthashmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_unicodePwd)
-        self.assertIsNotNone(nthashmd)
-        self.assertEqual(nthashmd.version, 1)
-        nthistmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_ntPwdHistory)
-        self.assertIsNotNone(nthistmd)
-        self.assertEqual(nthistmd.version, 1)
-        lmhashmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_dBCSPwd)
-        self.assertIsNotNone(lmhashmd)
-        self.assertEqual(lmhashmd.version, 1)
-        lmhistmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_lmPwdHistory)
-        self.assertIsNotNone(lmhistmd)
-        self.assertEqual(lmhistmd.version, 1)
-        spcbmd = self.find_repl_meta_data(rpmd,
-                drsuapi.DRSUAPI_ATTID_supplementalCredentials)
-        self.assertIsNotNone(spcbmd)
-        self.assertEqual(spcbmd.version, 1)
-
-        delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
-
     def test_isCriticalSystemObject(self):
         """Test the isCriticalSystemObject behaviour"""
         print "Testing isCriticalSystemObject behaviour\n"